From patchwork Mon Jun 13 03:36:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36192 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp281687pzb; Sun, 12 Jun 2022 20:37:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZvdgEJ57awvizBe1t80T0dslYjD9HbxX8ek/ID9EAehpStEttMZZL8DtGGtr1nsaF94YC X-Received: by 2002:a17:907:8c1a:b0:715:73d2:df36 with SMTP id ta26-20020a1709078c1a00b0071573d2df36mr3881882ejc.256.1655091428617; Sun, 12 Jun 2022 20:37:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655091428; cv=none; d=google.com; s=arc-20160816; b=z4YG6QreLtjEJ2fckglGmyOjmyHFROaBZJBMroqvHkPiEkEA1D8GrhPUVo/7q3m8GZ Bg6ykTI1rBQcEO3o4ZfZtbmGe5ZBntlfuiaIoVGcTqmgwx4Kz2lIS9jFYiy7Png/6ihr fdT0XU1fU88i4kI0kEglV9lQXI8kgnupo4FT2kXvW76P8EizjIzxp2d4xyDYyuNiaS53 VzGSJm2jf/rTcLHtxeY2gdLIzvrIrOFRcnLJFt5Guveu9CTpd3dIwl0ZkOyKwoj+w6R1 AoJ2GBRY922SAlMsxD9i7Fum8hAkcOuxDXAzWm0D71W/pC9HC9hL0SMC+f5MEm8znmUE QOIQ== 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=or2kmjkC+NxBFGdIoSHmRfTzuxD4cskgiRwWiz9w94s=; b=NOTvCe/JhrdwLjGvSejtgjj0y411IZ9OBtDQ8/bfXZfkpf7qH0cEk0hW62TloVwQUK Xa+A3ybWw/cQfy2LUpeROUUSYH0CEI38lsG1EYv28Ks9HTqITWLsvMnw3BHGJo9eL/Rz kjDpQ8hVsamdFEfRbqDsOLcwCv5wXulbgqZb0+z62u4sRWSg5gYY7XyPoM2Zrf/s9Vyx hjmBZyp4shGeqIWe/KaMDwTeHt/BhlmtKEUENHaR1Uhw8qiwpUUj+tu0/CfzcdN2pAHb aUQwIfWzEbBFSiugfmWQoKMOl7D/wRXs59gUM7VyurNGblH+x4RAd2cMItJE/wp0hqYJ QYHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=EjcVIi+3; 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 jr7-20020a170906514700b00710fa8b786csi5422867ejc.525.2022.06.12.20.37.08; Sun, 12 Jun 2022 20:37:08 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=EjcVIi+3; 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 89C3868B56D; Mon, 13 Jun 2022 06:36:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4007568B3AB for ; Mon, 13 Jun 2022 06:36:44 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1655091401; bh=j8Y0OObxzE+Y1wZefPCfw0I/fOFAkd6IlsFsLBB1NVM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EjcVIi+3/D+i2/nk7rRmDVA/PpLSMdUO/K3mPSh0ktE6s+gdl3z42QJy6c1TI8ljy ukWbdEpAoYeFke0gWScdSapr+w7CFPvBUakzHg26pl1Qe+dJ4npuAlEmoNBomQAjKJ cN1/qyMPKZNRsEQLX18brasWZCIrGwiCIkARzIIg= Received: from ZHILIZHAO-MB2.tencent.com ([59.37.125.124]) by newxmesmtplogicsvrszb6.qq.com (NewEsmtp) with SMTP id 926352F6; Mon, 13 Jun 2022 11:36:38 +0800 X-QQ-mid: xmsmtpt1655091400t59z4qy2h Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTb/ByxnjqNlg9iVCSRbzcPw06kpoMsv1nQ3Mpd7sWdJ+RjXdz5u RONPbS2vI6MCNTdS4PmuMQhQhsi1nExpQxTU1P+GF7iowo2ALWXQSZ28HhoDPpbQLOVk+4FB9JUO /pqa9a/0mawBSlgANt4Qk28+uRel8v0VX1o3hIyb5FK7HE+VPMa4IrXjhIni+DgC8dYEOsvwjwew wAMXqERleBRJkbz4ASvIEquSCRELi4p2AGfxUvyXiChwRJmT4WG3cnNV/MocTjcssWKrzzDUO08I DajOGzdWQnfN/aChHYLmzWZbMqXplHDxdsdNS/ygiZTUOQob+E0LvxdRC2bxBZPBaQydgDMjKNB6 GmB/nZdWHGjIxqUM/8fz1Hbg9gIR66c/BKlAnaVE64FZnVk1WQpifX6oYfugSERN/hyE5fD6e6vG ACj554X2bhw3LxtB3RXyr6KYY+dn8ySXiRhHPq8roQi1pOGYu2bzC9f2zl+JiGwlXa/Moc9DkY+Z HiA09+SavnbxqB9OHUjDwOxDfu9t4PWV7O+O+NJ12JBPqU9t5Kij5AinFWprZbCIJnGrLRvwCAmu sKlc3l4laQr/E9Ka/b2G0GRxAW2ksOUWni9Rn4I0YKNe59MtQehvwWNHWmx9uHkQ+rXm9hiI05Bl MrzCqfh7Gdx5hIU5RZeVGaNi5ltmGw5Chsyq9rvkbKNqOzhexAYVsRxkzIWuTOubyjs3MWOZrV5k 2xl34wnR7YUp0Ua23wO+A1X+wCmlcWt6ldP2zkH3A87+O9fXvLaCDhVr3y4dEq0wOjuDS/UKSj2I V8w8M8xFXR12X+w1bR6gBBNnB6GEWf/45ij8ZSh2tdjI5uNBWSO1RRGhxBx7wcYfF/enIHd+ws8o B0QTMjMwlFcvZTAIbsYUrU7vdi7CMZT8AlTKDC8J1Q+6pKDiYkxpMZATXfi73KRy2+RAOyJNDCt4 q9MdscfXk2DxVjE15+bCXfzCXwXzAF From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 11:36:33 +0800 X-OQ-MSGID: <20220613033636.84271-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220613033636.84271-1-quinkblack@foxmail.com> References: <20220613033636.84271-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/5] avcodec/avs2_parser: split data into frames 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 , Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WAY7sbvNvbEH Before the patch, the parser split data into units, not frames. Signed-off-by: Zhao Zhili --- libavcodec/avs2.h | 2 +- libavcodec/avs2_parser.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/avs2.h b/libavcodec/avs2.h index 7b66f51998..f342ba52a0 100644 --- a/libavcodec/avs2.h +++ b/libavcodec/avs2.h @@ -36,6 +36,6 @@ enum { }; #define AVS2_ISPIC(x) ((x) == AVS2_INTRA_PIC_START_CODE || (x) == AVS2_INTER_PIC_START_CODE) -#define AVS2_ISUNIT(x) ((x) == AVS2_SEQ_START_CODE || (x) == AVS2_SEQ_END_CODE || (x) == AVS2_USER_DATA_START_CODE || AVS2_ISPIC(x)) +#define AVS2_ISUNIT(x) ((x) == AVS2_SEQ_START_CODE || AVS2_ISPIC(x)) #endif diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 3755dbd78c..71cf442903 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -31,7 +31,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz if (!pic_found) { for (; cur < buf_size; ++cur) { state = (state << 8) | buf[cur]; - if (AVS2_ISUNIT(buf[cur])){ + if ((state & 0xFFFFFF00) == 0x100 && AVS2_ISPIC(buf[cur])) { cur++; pic_found = 1; break; @@ -44,7 +44,7 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz return END_NOT_FOUND; for (; cur < buf_size; cur++) { state = (state << 8) | buf[cur]; - if ((state & 0xFFFFFF00) == 0x100 && state > AVS2_SLICE_MAX_START_CODE) { + if ((state & 0xFFFFFF00) == 0x100 && AVS2_ISUNIT(buf[cur])) { pc->frame_start_found = 0; pc->state = -1; return cur - 3;