From patchwork Fri Jun 10 13:50:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36146 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp954391pzj; Fri, 10 Jun 2022 06:51:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyv0a2c9x3qXaYqMfqWmx15yMK4Av9YyqLVTFUNadMxfDHc28J/ZGOQsxMBnjcR/2zUFlXU X-Received: by 2002:a05:6402:84a:b0:423:fe99:8c53 with SMTP id b10-20020a056402084a00b00423fe998c53mr50477185edz.195.1654869063218; Fri, 10 Jun 2022 06:51:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654869063; cv=none; d=google.com; s=arc-20160816; b=vtKp6WBPSUluBmn5GbW6Uao4Q7gZjsbHkU0rNO829Kqp394C1oW/u4O2r9iEvtJ4kk 17+ZXCW58gjZqkAITgJIGgeUiFjS1T+AuyeUpWZSSksRjmqDhMVgRrwqOBzsRQ4ZlTpF SADBFbGZAKE7okpEbddWFL9sJk6HhG1dH2zclBZP1LXgqWv16Gnwf8Q3Zc2E93jrW8pC ArRltzT129Kx6tZxNVA/LjNvvBQGTe7rrW5Y4gxn+76tvEXV1+2sNHcMHV0HhoLXRk9M +lPIHxs0xw1coEL5JHR7sUTKczO9SDAj1QlRl/iXP38vmfEfcvrGen30kckS89k1u+NP K+1w== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=ctP8dwXlpffkdmNRI32N+ZukX1wSbuUTMEBRTjYq+1c=; b=duMOsyO4TavW2HDAOuLeiTOl89rVpXCJjasCkcsiqJQdKAnsQ6HRXn7cOQ8pKotai2 9O0hKS4EgSTlMTIIMGz6rK2qP557gnD1nK+YiRXGma8gkeYx+IwfSkAzu2Sz+rPMQLJo Y7ro1Qk2OIrSp72gzULqNPbCkEdpq3NI1mNpe0WcpuW3CWMssZF7ljsWK3xNdOo0rG2w a+bWFhD98cWytdFVNu/5XBG+WadUxj17xeciPHxpt/qsk/VNl0osgBHkmG5dY/Q7JFIY m5x0eNYG8s/JUQNBhmxYQHhwbM1VavtYhcR/10+4tqXZ/I9w0dDfrn3mKQkItQsPmR+d ESaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MzzueUB3; 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 g16-20020aa7d1d0000000b0042b6db702a1si531837edp.545.2022.06.10.06.51.02; Fri, 10 Jun 2022 06:51:03 -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=MzzueUB3; 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 20F9168B4BF; Fri, 10 Jun 2022 16:50:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-231.mail.qq.com (out203-205-221-231.mail.qq.com [203.205.221.231]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B15168B2C4 for ; Fri, 10 Jun 2022 16:50:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1654869024; bh=764CbpcebBJrVWbqv5np1bBWsPZH9ysW4a/6jGE84MQ=; h=From:To:Cc:Subject:Date; b=MzzueUB3Y0M00rXosx+DV3vTQUAg1FcMk4IdxnpYmqgtZSY7GXyXso4zmKwPe+XI+ VIPFUpmTLFr0nUkek9qPxjUEL9JTYAl7Qh5qlmZprqwjIU8/hnIF8ontv47yfD9upN y2Nit8JBMIKmKvRuiiRg32dZFG0mv/eZqq2nN+00= 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: xmsmtpt1654869022t19a2y2u9 Message-ID: X-QQ-XMAILINFO: NkHKfw09D6j8IHR2dbY8/4rqe65Ke1POg9YpaAqoPts3CDF59WDgzQyqLAv7ZY 7rJsin44PrQXaWqmKAl4CAkxfCiVanqQUjwJGSJAgLHcfgJhE7PDodahtJrLJZkc9uJVWddR/JFt I/97UCM5Tf2lzmKuWA7af5Nn4VYGaQLWA1X17DPcZG4Qp6LlB6rgIiO33fw54iSKUUATHsQ7upTz e8fHSCfDjkunoZI3CZWG5C7EEtKydmPfFEEAahz+09yjfej77J740U607vnbpaS/w7fQOn7TdJpQ 1+JDdQiaGElteh5029O29V/Vy5mNXml+mxwZ+fq37ZhPmJnrRl0ErnBi75O7V6WaAlSerkb9RtGV cjLkVSlzPFp5WOqXFu6KCalgo+ixyCBskPB/vdwdTVY+VxJKwaR4x3RzjgFZ8kUbpxCWNf0wiJao Mxlef+XJNf+520rkAqP9pUrI3PMi+v0NjZFts91SXHs0Bi1PTW3JeVE7IaBzfGsVDOZdVlN7x1Pn qE+D0QfXAi2OBXeJSs5mhDJ4pF1qyOn9K0Aiil3414ZJ5CdcoR6fqFeuaqqgC2kZ9v+/BbLpfzfJ HyzWFBl730g5azmF3iZ8MLMJjzz6GUqME7x2xI7IlUowEXNnXXYEZrQNp9v8OSwMVHyv/zAodbR3 ihtu4X8ToLE8mAEsgGabrV2tVzNkD00t1FUVuiQDxxOKOkf3R6B88HOklFWFyk3cVH7OsLcv3S3d KLNeF7xJuuFv9XhksgflX0C8Lq/iwrxgnYd704hfmB3wv0ryflHSTqxtuGtzdcAuOFC4CYH88TJz SNdmypDgv4Obc1h/eC6atWsAbNsKSZRiOY2xUSeLIzAUO7qEQjBfe7FgckcNHbZLSnkUUf8biOyL 2ipAdllgECRz+GGFtSqyBnFUeO41ZCrB2Jc6zcbDqbIPS5hk6rgvBFPCYWfiNTKadgDZ24zsu4yN sJn0x+kuDh8nX+B+7hzA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 21:50:19 +0800 X-OQ-MSGID: <20220610135021.89892-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/avs2: add AVS2 related definitions 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: wD8jx5RDMX/1 Replace magic numbers by enum values. Signed-off-by: Zhao Zhili --- libavcodec/avs2.h | 41 ++++++++++++++++++++++++++++++++++++++++ libavcodec/avs2_parser.c | 6 +----- 2 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 libavcodec/avs2.h diff --git a/libavcodec/avs2.h b/libavcodec/avs2.h new file mode 100644 index 0000000000..7b66f51998 --- /dev/null +++ b/libavcodec/avs2.h @@ -0,0 +1,41 @@ +/* + * AVS2 related definitions + * + * Copyright (C) 2022 Zhao Zhili, + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_AVS2_H +#define AVCODEC_AVS2_H + +#define AVS2_SLICE_MAX_START_CODE 0x000001AF + +enum { + AVS2_SEQ_START_CODE = 0xB0, + AVS2_SEQ_END_CODE = 0xB1, + AVS2_USER_DATA_START_CODE = 0xB2, + AVS2_INTRA_PIC_START_CODE = 0xB3, + // reserved = 0xB4, + AVS2_EXTENSION_START_CODE = 0xB5, + AVS2_INTER_PIC_START_CODE = 0xB6, +}; + +#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)) + +#endif diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index b7d5d7774e..3755dbd78c 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -19,13 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avs2.h" #include "parser.h" -#define AVS2_SLICE_MAX_START_CODE 0x000001AF - -#define AVS2_ISPIC(x) ((x) == 0xB3 || (x) == 0xB6) -#define AVS2_ISUNIT(x) ((x) == 0xB0 || (x) == 0xB1 || (x) == 0xB2 || AVS2_ISPIC(x)) - static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) { int pic_found = pc->frame_start_found; 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; From patchwork Fri Jun 10 13:50:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36144 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp954229pzj; Fri, 10 Jun 2022 06:50:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQgzQWZpuZDfqBHxbGdesdN/5Eqnnq0ej4njsRM6GA0mI5be2B9Sbkg+jezUMV7Y86dJv7 X-Received: by 2002:a17:907:1b14:b0:6ef:a5c8:afbd with SMTP id mp20-20020a1709071b1400b006efa5c8afbdmr40835289ejc.151.1654869042409; Fri, 10 Jun 2022 06:50:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654869042; cv=none; d=google.com; s=arc-20160816; b=gdQm5Zc0KYqvg34MRmxDxuP+SlpJlryHmT6RSSg6Q4c39Nv7UkOwfw4hMgGjBVaw5A mu1HDDJeRpKDG8qfl+6/mWPL3kl0xYY9ugmrLs3k/0zSG1l/Ne1GdUHs6dzSBiHXLEZg wxYCK1gIIglzTp/X7LLjKdTvn8PsuSGHSfAVKUyrfIWvLmycwnjhYuOC2AVpwYQemJN5 CuJ/W4snlMKifiTs7/ZTqVm5bmaVuAnfiAMf2YdkW0E/W8Ze9t7TeKcrrbg6vxcBU+tV Gqtr6XOx+smmOfVkQ1GFy46zf+1EnXrxCSUlB2rlAnxMFOnP40isIdhtnp8dfA6BDETF PL1A== 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=pdMRtbIX5oPIi1i4x3l1pF5MULRwOyMO/YeLn/QrIOY=; b=gCj1wQs8u5eMW1RailCjBLkGobYx05UZQ2Mbqmzt16TrqXxq4IiHBAihsbyjPFb7xt 8daZVE4Fl1Z9mOiUo1DHril7qv5fW/h7+pnkNtQZWrxYFiOWQmiEN9pqoNL1VgGK8Dnp 1P877zIsF+9Eq2UOH9LuhsQ+EtTaPx7d0kTxquH+HxxzVSxJlyDe5QD4R7TfpmtnB9Az X9lIAvOT++Ctii3osayvR+dfv6tRjiwZKERtIysv4iCSJU1a3LkFVPli+XgKpNoj+o81 jwFj3U4VvEcgbla9PVZjnqaTY+FK+cqQIuEwcHAHEV3PenElD4y+sRaWy8BlPQtpsLJv /9ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=BBvBaNYM; 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 f17-20020aa7d851000000b0042a4bc4129esi5922943eds.186.2022.06.10.06.50.41; Fri, 10 Jun 2022 06:50:42 -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=BBvBaNYM; 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 0A2C368041B; Fri, 10 Jun 2022 16:50:37 +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 3ED7268B257 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=1654869025; bh=cY3A59eFpBzpXcEyJs+nA2UCSlDZhRNsLR2F5btvBMY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BBvBaNYMtWQi9I4I1gFf6VGFlZEaPHY07O78ZmwpOKd3UMAdqrN/gvsxIBSnw/gkD yClrgZdfJ894qBJgu9+5F40i0qTzOFNOZXQMb16ANWflI+kKV53ob7+IKwXgqHhe7o GuoCy27g5khAykpQGSxAwplOTS452fw0f1jd+SgU= 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: xmsmtpt1654869024tifkbxn0d Message-ID: X-QQ-XMAILINFO: MtyEhEaDnone+6Xm3fwlkEmzcM69WKX62xzZxPZz8mSYv2iOIbiC9EuzodPgzu mqqkVk/3bJxXtppgqnm4vTDtSBn/A3u7pngj6V328E3bhbxXmilGwaIXepSnoSQXn4HWNrQbGqOr hraRlJyuNZz/ivxzf/+eJjIbkpTIBkgR/IKYl88CQwJxJrBwKBcRe1ZEsIKY3m8bD7n0vPHFiJdq IqavtJW1euSZ2s0gWPbmjuEOa29kM38j05jA5mvM38iTs99ui7O58v8wC0HWfUr2WF69a2GpLwtp Asl/G28ZTVge6CSUOSb8vQSANKudWzNQr5Rrrqo0a4MxFs8p+X3SVGLxxuFqQ7gM0x8H9GfgwNNU 5p7Abevq28ug2j+JwwFLnJos9ylIQfvLtVhxcf2ybeMRr9OWQ1U1ew29DIVeWPxaNq7i6RK9FoI6 W6QSCwzpEEPn1URjhbtOqtrqHBVJNyRyGFlAQgOD+pTlp2MeXwD+EltyaEs9svp7qWDpUhzidT/X Z8iI/utrqCcuTMlbHMGdNS0WCT+sKi2c/7vd1rKRLdHY7hhOC8pknbV+1mdBuAiLjZ8AyciRebVc iF+sGmhbuUS6TVvSywA+iPpeNtH3Vfi9eTnxQOYf63ewmnJUglvEQGSvEuBOR3LQccN79+fncrZS ABdvHaKdmp/wd5KJZRNpeOSaydY+D2AvgoMC3DLf1VBrHqZQw5+VAGyO6GEtZwm0E+AVkHanrPTC zYXlANnZrcUvDpdY/ETHNLHKHuDKw9QyIloayet+MSsA0X1DobBVR9Qt9J5Jd1HmPiHvmuAmIKfR Wa7yN9Mc+lUu1Hp+1ZAfT+EUDIMLpb+kZ+3j6pgYD8DLjHIzt/uBfDvbMlO11hmosjAxi3fL0A3t wlk+bA8MI8DtGEOejpfLI9fLqWonh4N0iepsAUgDqgVQleDjWb34Lo81qGbnDm/gj48iCRRRZcuL u4g02cHob2Hmw8phc50g== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jun 2022 21:50:21 +0800 X-OQ-MSGID: <20220610135021.89892-3-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 3/3] avcodec/avs2_parser: parse more info 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: BfVMJ4F4Y3XS Including video resolution, framerate and picture type, etc. Signed-off-by: Zhao Zhili --- libavcodec/avs2.h | 27 ++++++++++ libavcodec/avs2_parser.c | 103 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/libavcodec/avs2.h b/libavcodec/avs2.h index f342ba52a0..e961c7d517 100644 --- a/libavcodec/avs2.h +++ b/libavcodec/avs2.h @@ -23,6 +23,8 @@ #ifndef AVCODEC_AVS2_H #define AVCODEC_AVS2_H +#include "libavutil/rational.h" + #define AVS2_SLICE_MAX_START_CODE 0x000001AF enum { @@ -38,4 +40,29 @@ 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 || AVS2_ISPIC(x)) +enum AVS2Profile { + AVS2_PROFILE_MAIN_PIC = 0x12, + AVS2_PROFILE_MAIN = 0x20, + AVS2_PROFILE_MAIN10 = 0x22, +}; + +static const AVRational ff_avs2_frame_rate_tab[16] = { + { 0 , 0 }, // forbid + { 24000, 1001}, + { 24 , 1 }, + { 25 , 1 }, + { 30000, 1001}, + { 30 , 1 }, + { 50 , 1 }, + { 60000, 1001}, + { 60 , 1 }, + { 100 , 1 }, + { 120 , 1 }, + { 200 , 1 }, + { 240 , 1 }, + { 300 , 1 }, + { 0 , 0 }, // reserved + { 0 , 0 } // reserved +}; + #endif diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 71cf442903..0638a35030 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -19,7 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avutil.h" #include "avs2.h" +#include "get_bits.h" #include "parser.h" static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size) @@ -58,6 +60,105 @@ static int avs2_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_siz return END_NOT_FOUND; } +static void parse_avs2_seq_header(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + GetBitContext gb; + int profile, level; + int width, height; + int chroma, sample_precision, encoding_precision = 1; + // sample_precision and encoding_precision is 3 bits + static uint8_t precision[8] = { 0, 8, 10 }; + int aspect_ratio; + int frame_rate_code; + int low_delay; + + if (buf_size < 15) + return; + + init_get_bits8(&gb, buf, buf_size); + + s->key_frame = 1; + s->pict_type = AV_PICTURE_TYPE_I; + + profile = get_bits(&gb, 8); + level = get_bits(&gb, 8); + + // progressive_sequence u(1) + // field_coded_sequence u(1) + skip_bits(&gb, 2); + + width = get_bits(&gb, 14); + height = get_bits(&gb, 14); + + chroma = get_bits(&gb, 2); + sample_precision = get_bits(&gb, 3); + if (profile == AVS2_PROFILE_MAIN10) + encoding_precision = get_bits(&gb, 3); + + aspect_ratio = get_bits(&gb, 4); + frame_rate_code = get_bits(&gb, 4); + + // bit_rate_lower u(18) + // marker_bit f(1) + // bit_rate_upper u(12) + skip_bits(&gb, 31); + + low_delay = get_bits(&gb, 1); + + s->width = width; + s->height = height; + s->coded_width = FFALIGN(width, 8); + s->coded_height = FFALIGN(height, 8); + avctx->framerate.num = avctx->time_base.den = + ff_avs2_frame_rate_tab[frame_rate_code].num; + avctx->framerate.den = avctx->time_base.num = + ff_avs2_frame_rate_tab[frame_rate_code].den; + avctx->has_b_frames = FFMAX(avctx->has_b_frames, !low_delay); + + av_log(avctx, AV_LOG_DEBUG, + "AVS2 parse seq HDR: profile %x, level %x, " + "width %d, height %d, " + "chroma %d, sample_precision %d bits, encoding_precision %d bits, " + "framerate %d/%d, low_delay %d\n", + profile, level, + width, height, + chroma, precision[sample_precision], precision[encoding_precision], + avctx->framerate.num, avctx->framerate.den, low_delay); +} + +static void parse_avs2_units(AVCodecParserContext *s, const uint8_t *buf, + int buf_size, AVCodecContext *avctx) +{ + if (buf_size < 5) + return; + + if (!(buf[0] == 0x0 && buf[1] == 0x0 && buf[2] == 0x1)) + return; + + switch (buf[3]) { + case AVS2_SEQ_START_CODE: + parse_avs2_seq_header(s, buf + 4, buf_size - 4, avctx); + return; + case AVS2_INTRA_PIC_START_CODE: + s->key_frame = 1; + s->pict_type = AV_PICTURE_TYPE_I; + return; + case AVS2_INTER_PIC_START_CODE: + s->key_frame = 0; + if (buf_size > 9) { + int pic_code_type = buf[8] & 0x3; + if (pic_code_type == 1) + s->pict_type = AV_PICTURE_TYPE_P; + else if (pic_code_type == 3) + s->pict_type = AV_PICTURE_TYPE_S; + else + s->pict_type = AV_PICTURE_TYPE_B; + } + return; + } +} + static int avs2_parse(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t **poutbuf, int *poutbuf_size, const uint8_t *buf, int buf_size) @@ -76,6 +177,8 @@ static int avs2_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } + parse_avs2_units(s, buf, buf_size, avctx); + *poutbuf = buf; *poutbuf_size = buf_size;