From patchwork Fri Jun 10 13:50:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp954307pzj; Fri, 10 Jun 2022 06:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynWr0nJ5rZLw3/+fsDrmFd3ZDePqv6qxshmPTQTfuJVr6RdnqIQkOME6HF4KnMAiZN1Fsd X-Received: by 2002:a05:6402:1449:b0:42d:d250:e504 with SMTP id d9-20020a056402144900b0042dd250e504mr50981481edx.213.1654869053269; Fri, 10 Jun 2022 06:50:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654869053; cv=none; d=google.com; s=arc-20160816; b=bzWAkDnE2iyVBaW3OdITmf+66G2P+1+0g40vyRbi5v1+E1Te1j+Xgyd3RP7yKZdZ/K Wb99aUH8uhg+0eioDEAsC/8yt4cvRfoaBAjKKV6ZFw1Og+0Xa/7VorYqEFRHHZimh+Mi B5SItvsCs2eW6+0Z8SzN3d1jwZvLrnxbob7+yP70eEXTAPlRcW69JRtSsExJ9jp/ULJp 3u7NKWld3H6drA3QafY0xtwtM57hz+wwqMs/tdqbSOTddumA69H81YDv/WC+fKlGzo5i +IL0XlETGCsbTQHU0gCekeC29S3O5gljTmxnc8EYWaQzCvs5yTWIPOthQcffSTKpvAmA Fhsw== 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=A5M2a4aFZYhVg8TXGTaq4lGZczWxBFOaACLG1Tv3bpA=; b=IxkGFn9KilUyVd7DMm87REl39izZMLmWliCqr0+cHKoSWPM4g+bvvoN95GWKXLTOev W8u6xlAKVdv4Ymmhf6g7ZGKJQDWE1nQz9+WiX5gDELtgheBUuAoQrbZNJ64+voDNF+/l SOXjX+Sc4ihT4t1Ze3AMc2oHpKWmtaPBvxxOEgl/msf06k1dydU3YWU8jO0XbugcEaGM md1icV+/o+dVD/GgFIiC0N3WxXNWF2mi17lH1c0sv0GAJbX+MiDR885dIf9sVD80vDfj BW3bajON2w49UJZOijr9IVZ91rqGD65Oux3i4rwYu4dM71ywDcWP26DxPGS21/vKxMEN 23xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=wbt9lNaQ; 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 s4-20020a17090699c400b006fe815664dasi8434384ejn.315.2022.06.10.06.50.52; Fri, 10 Jun 2022 06:50:53 -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=wbt9lNaQ; 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 1FC2A68B476; Fri, 10 Jun 2022 16:50:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-233.mail.qq.com (out203-205-221-233.mail.qq.com [203.205.221.233]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C23868B13C for ; Fri, 10 Jun 2022 16:50:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1654869024; bh=8GXpHSN1Xmtp/OKueTB8Ij+fabTjdXlloPVbSjCOlh0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wbt9lNaQxaMmzIb9mdtOYsq0uSyUuIMX3U6zIhhbLLnxZEStz7o/Rk/S8srYt1T+R VAAZY1fHP9bdUj8gNsDkWTo/CbXAYWxe6Qk+8lJxGWjxqRvuzd4FnNCgAZfQCEJGik C4kPDEDwcL1hiFypvXq1zoE3kyXB1cimSTuA3hX8= Received: from ZHILIZHAO-MB2.tencent.com ([59.37.125.123]) by newxmesmtplogicsvrsza7.qq.com (NewEsmtp) with SMTP id C969E6AB; Fri, 10 Jun 2022 21:50:22 +0800 X-QQ-mid: xmsmtpt1654869023t71l7spjd Message-ID: X-QQ-XMAILINFO: MmPNY57tR1XnoWFTAYWuxFIt5MKRSRo0efFLtXmPMYl2oB2CvTEP1Gxbg0fzNB 3MmGOyd5crMUkpCp50znonWDRkWjny46WNLsNUPaX7aCYxZgLcEn+oMO/3tFu5To2RSAFPQ0Pba5 TnRB5YV6rtZqMOaengBlnITUmRQynbt2x+3Tcos0+UdkqeZGWR+4ysyMqf9jkpD90b4fV6i1jc0b xO+A2PeVW2uLl3ZoSXW201Kh5CMXc540xYyY7mN/CSGj3U76wOxmAw9P+ep+MlTL0NsFF2Uxjkxz 1N+gg10rK1uM56V1DQbLJwwndzx7sUYoXb0XBSZEvi5Tmxse7TThzoZywuNwp71LrKZ2RGWns4QM bTg3eF0rhzDApsSjHUWz8OAb27f1oaW778bEhAtiVsUMguYlI48jngmxoYp1Tpn6v8cU5iZyAJC7 gcCLyTucXdpeMU2K137EcZLw6gLNbvWd47bzZ9DtdRIquJbGyDU93akqpPkmk5LAvYBuTgmeE2vr XhgCvKdvMfwXJmG6glkQPQ2RBQ2eqZpE/yW/64PW51q6KF5o9xTZLLt/Anu+l9HwSRtybTCOHZi+ CSUwf2y2N+uQBZq9olX8ZvFqBVXj89prFIZB6adAnWij/NxlWP3hmqGaQiQoeMXnyHG7FzlOg2Cy EkdkBpHjtYT8qNWvd9b8lhGz4JhCgnpLOJoSlnjyl145xl0QSLqDJBLIPRkKNvA1xttL7CnAydHJ /GN62XvWIFxsziK2J4y0EF8d8WK1HWyoIKbitEGcGjS+9sNWuzhrMLn9TkL7TWA3WTom96gvqe7D rhIYHf3enUDttcM+LTD51yEnZ/hC60Bf7O9Xf2aag4FZQkg8oVh/7RgIGc7EG5Prp3bhcpujg3k2 Xk91B+V5DFln3HYdNkM3eO8S1FoIl4P8jW3TGITh3UQFqqWeMizyff88B8/rf9WsY/GNsax/is4E G82GnpRelaEsLoLEkMlQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 21:50:20 +0800 X-OQ-MSGID: <20220610135021.89892-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220610135021.89892-1-quinkblack@foxmail.com> References: <20220610135021.89892-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] 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: QkmxB7KKKceu From: Zhao Zhili 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;