From patchwork Mon Jun 13 03:36:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp281666pzb; Sun, 12 Jun 2022 20:37:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxEm9GQ4gLr4vRp5rfMak6JdheOYW//rzC2TV4yyTPHDJx6HKeyIn63ou8FHR/UOMLsxejZ X-Received: by 2002:a17:906:72d1:b0:712:782:6fb1 with SMTP id m17-20020a17090672d100b0071207826fb1mr18212218ejl.217.1655091421448; Sun, 12 Jun 2022 20:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655091421; cv=none; d=google.com; s=arc-20160816; b=yFkbrNCWu4JlJ+6bWTnJ7E1jTrpxXlHax1SVFJto9YvZRNX2GliB31nf94MD4qcTrs 7msCaCtlCuIFab1Aj3PUf7OvEVT+h+b3Q67MnkUTWx6drdBapIhOuuGbj0e/KXgIKkM+ 7z9z4surat8PLqA8KqvVfLMtpl1zeIk3woYn8oBWZZ8Wcwuw3hGrpMMFPqtMgEVYsO+D i+jey6IlVy8Jf27jYzL6wVHkA7WjGnKo/WVDQYoBsuERSuIxipYTFEQz6QU65BGAFWuj SdAtHSeUnLX4QO60BvjxiOEk0Z9xlTsY/k8S27+6xAnTYLB6e5l7blM3/3f7JEXwKGme p5BA== 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=3G30cNvRlhGRaYI6HXqVrtZbBYKxHbmitFf6N7NFX2w=; b=msWmUk+es2U2u3UfejOPGhIa3XoEGn3EEonJaPLnz0E3Gg8dJMfdON4BvzMydGna8H ssKmhyiwakLvRVFVuCLz83yqs2diJzePvOETUZjY5M/A4xCJg8N7nWdQTe1r/o6t7QjN Y3zeIw5p3zvichqoZd0Szsy8641KAeYCcR6jy8M664O8lHTp1YG5f4CAdinAA3JecPMd RamRPamg3UUYRTYFNyoguhJxNcqHDRg698YKNg/CNDEGeTihwLWcj+wkpwSSUrpesb9o 0/KlVComcdF6babzEFNlTnlqCE8YUTAAoREVf9TlZibiO1eAPKPt7Hyyxc6ASnXQgL1b ElVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=q6V1LBmH; 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 z17-20020aa7d411000000b0042bca44a597si6047077edq.449.2022.06.12.20.36.56; Sun, 12 Jun 2022 20:37:01 -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=q6V1LBmH; 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 552BD68B571; Mon, 13 Jun 2022 06:36:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-221.mail.qq.com (out203-205-221-221.mail.qq.com [203.205.221.221]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C96C068B2AF 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=1655091400; bh=BCbA41P9rVtSNxOQVK6nGWQ8IlWZ3r+N9YfIhk9Z3yM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=q6V1LBmH+cYdOVKFxTyBFG+6p+AOwFMZQYGVEa9MVA5/95cIRM2PN8y9Lh2/bJK3b wXCXV00GZKIpVBAQzAzo7DRXKz4pJN1WL0hfz43oiO2mxQgBszAvi9pW0A11z7MTs3 g7QAHBXoHEU1Mj6qI64efbYqXbkP7S2SXm1u8Pqo= 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: xmsmtpt1655091399tngip32f6 Message-ID: X-QQ-XMAILINFO: NQR8mRxMnur9c9JCoweE3QsSwkvsr9K460Yq8HnW/PrAXQq2wQN18dJgk2CbID vseSEemD2AIHDLpnvIaAMSNfxUOYBcZRWZdqslJqNYie9hw7OY3CcpCACjCHOJErGcwGOZU7W5mn IBTD0xk1uVCHCcEipvJsd3y5JUPtt04oxIlxYVVw+RikZCy4p902r6kWvRozwsSYYQSF1hrmxQEW onW9wP+lW/838EYjmP6raYc6XT5Wv5L2Tfh6wv/Moe2O8m5AdRZJh7FvOQeMz8rPyOF9R8O2YwMJ Pgu0aqofNQFCj1XEmwCKgY0Bja4KO3rhbd4Cenho8dZs+wISsH0OcE1X+sS/D4D96IgmxPCyPv6y DQAZzjwIB+8A0eAETdNxpz6JGc0YpqaZ/ZcvoiVZ6dtet83JYS4pBVHBwAC2l9RjkWz5+TE+IGW0 7+7sxbJ+bEC03zWkJ+ncwqnciyWWkkBIv6UfqzmYST2ZKLo0+Zg4lPVx/x4AzesULRAK9y2G9OMI CHRkWo613bHwjwDUwpJblqBHL5RoGruYQe//8A/QilDdwIHOX6ahZQ9p1L/h0nFG3Lu5R0OqdKaN h2u6cra5iEOx7xe595KIB9XCjJeuqT5GQ4YM6mRWTlAks1Z1RFEznxmhwkkwAoCCfHsGvatVo2O2 aYpum9xJyQ3N9kPD56JH53za1+py5qUGx5BkvZFZEF7HAY/wMuiQ1knrKcRZuJ4nZ0AzSLK3y62B MQmJ/IaSIiIZlJFIa7D735vDyj4VYQV6zOokOkYJfhxXvBwN6f+ULrvIwnnv5otsBfaORnnAOxpT Q+EdZLW7uS5xz0uXgiWsmj3yJ7HLYNKDvALCi9cuk8VRXv5nFaPthu6xXXK4l/Qkr4/HHy+PInxX yU6C3jeEo0xSVUIOOF4pRpz3k4uRqKkF3FeTJG5mZXioxf4y5fwmoB8NkKotIhQTl5Lp7wt7rxWv JomOb8kSX9ksjWfQXLdbspJC4gCBkU From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 11:36:32 +0800 X-OQ-MSGID: <20220613033636.84271-2-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 1/5] 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 , Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EkWtl7DWXjOX 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 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; From patchwork Mon Jun 13 03:36:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36194 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp281780pzb; Sun, 12 Jun 2022 20:37:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwrGHOJFP+rLC8ElYAad6VctwGvsKOTF67qQNX5+2Uf1NiOx2ZMA/KtM6A85ykbVTDrBu1 X-Received: by 2002:a17:906:7952:b0:711:d4e0:da23 with SMTP id l18-20020a170906795200b00711d4e0da23mr32628108ejo.305.1655091448266; Sun, 12 Jun 2022 20:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655091448; cv=none; d=google.com; s=arc-20160816; b=ryyef1905CljdEh7AS1pb8TkUIc4v0A3AQ+szvWczSBy09G903m858s6dqXL7j8u0p /OLAHjhC+UH7AZSihOojYdLUdmwrrokY7eEEwfvnZbvPVKvLIggmqQCRty4879aiErYb rEoVjkTDFB4zIrALCZ7//lTrH17bWAw2TORHduIt3gRM4F2AdavwUIfc0HVx8k9amCoB 1Ne4QT2RQdPBIPT/RqSBHBz/F3SFMfFcAnHfd7Fjym+F8JwyRAo7qen+oZhstOumaHFM VNW1ZOawrjbXsus4fZl7jo7bhf2Ze4MbNQtStBe/8aD2XqXohPMUR5RMQ2NfmxbT8U2X AN0g== 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=pmDPB6k9NkyMVWIzWR6cVHMBgOrmXh3QSJvxmB8Cp4U=; b=Z825I5dgeBC5bcUzh7NEJeomoToJ9Ay4q5K3smLXBpfz3bO4qS3NauuwGe5/4k6gYX LXqKO0blm3Dhj+INwFWw/L2FCIclOceXCg/HP+vfafE5bUtQL+YIBDLX5G5i0pGUR5OU ajrw1MEsl8k8D3ipbgmWV2oTbum4cg8d8B2RqpKxZvftPge8SOrb8bErVlIS0b7a+Vvw UAmz9RVMwZLh829/5gI3gKQDtTSTqQ28qRw7scSE+ui/Hf9dy3E7DQR6/GrtByd+QWPV pwqqj2I0bs+Ug0SRXmMYnqPQ87U95ztl87V+tDOJ/u+PDISMrKvjccp4T6pHls1taXjR wJ7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=TqRaenWG; 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 w16-20020a05640234d000b0042e4da74023si8678361edc.515.2022.06.12.20.37.27; Sun, 12 Jun 2022 20:37:28 -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=TqRaenWG; 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 A91BC68B58F; Mon, 13 Jun 2022 06:36:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-80.mail.qq.com (out203-205-251-80.mail.qq.com [203.205.251.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1BF3868B579 for ; Mon, 13 Jun 2022 06:36:48 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1655091402; bh=F8PjvcI0QOLu6X/SWF3aGMdRwQ6oWvEigaKftrDeB0A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TqRaenWGAmyXmokbO5gN5TOKh9mP6DoMDYp+iP2e49w8wcdnQh1RMtV5SoXV8FdWb 6oWCSQyObiM1+pwhACpBC2PxAAyC5zD0YhEr5fez5vccUaLUqUuAm1riCujtg6b1Ms UBZ+xUP6fCsCSQMEpQ+KinmrsvsfmWphUTJde1hs= 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: xmsmtpt1655091401tu752p7ke Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTb/ByxnjqNlgP/LyKaOr/uRIwqXg/KJQ8wd5aF0SHOw7ctuB0g3 I0WklmmaFKjYfmu8B98NkRqtqh5XD8Xa1Sm09dGc8OHN3nsKuZw1oKS4xRE1WU3QEn2HyMARetdP PiOib3krJAd/gVHCyYThEPP8fgW1Lct7cnSsGfGvRXNCnUp8rbIZnnZTOL5a86mgNG/6hGsk0/GF /Lxdr5lPzsxhyLHH5wxmn42znExdQj2gfk90ye6Z/sleoxcJza8McFtzkcnCtk/hw5AcaQ6EWJy1 PSlAmPCPAi5iMyzzgYExyj2AEzpZx5m4Mrm1cPXyvavhCXoyXvyJKcpZhGZ/J/BASUDaqahEK7yK R/ncMuGGmyv9dRGmN7NnvH9JLhZ6ENdm6zI8JLpiWjDYDi1cgwC+CLVzyKCpSv5GRh8iR2d1qYGs JFjsrZkHQk8E7pZiqQf+syD4tCx5FmmlVQekVxGHaZIM+oveQCWMfMbL6SGzyndeaPf/doKfwVCX o3Jbq7hyY6qQBZXTx9U0Q98lguvn4RiBq/hrdNwzkZB3Ix8gHQ2nIGmjwFnKd4iwsrhkpwpcWw6s Gz0Hj9ox5v5zEWtnulTsUD5SHavzN42U+z/pdlsRxxnzPIyswGN1h3P5kNLOVvT4qqG7GNqEvtZ6 ZDETpLXuGfDAE1XM8SbpHjPkN1VPYOoYAXywKfz0ocL/ofsFgPd36uEDK/Wqu/08GQrsNv5MLk6U c7B06srbnzmo8Z2wmEUHA1W1+YdagHKiYBZGjjbzXoTBA7upRTcVBV1WZkRnJRUJK6ZBzZsofxb5 cofJRQzg6/xyvAGMDY8Mn0/CHNTsHgFzs2w7xGZF0Wzzj4dUG1e0K58yEugvs9n2GPBEvup/fnP7 /HGH2WJu13flZouhkIuEQ2YuZjjB9hefC3CcWOqV2Twu+mLOkgwj+3k2QKAfvpzOaQT5r/9HaFDG ZQ8yfIatI= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 11:36:34 +0800 X-OQ-MSGID: <20220613033636.84271-4-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 3/5] 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 , Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JbnGOQtu4JwR Including video resolution, framerate and picture type, etc. Signed-off-by: Zhao Zhili --- libavcodec/Makefile | 2 +- libavcodec/avs2.c | 42 ++++++++++++++++ libavcodec/avs2.h | 10 ++++ libavcodec/avs2_parser.c | 105 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 158 insertions(+), 1 deletion(-) create mode 100644 libavcodec/avs2.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3b8f7b5e01..6cc6f8437c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1114,7 +1114,7 @@ OBJS-$(CONFIG_AC3_PARSER) += aac_ac3_parser.o ac3tab.o \ OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o OBJS-$(CONFIG_AMR_PARSER) += amr_parser.o OBJS-$(CONFIG_AV1_PARSER) += av1_parser.o -OBJS-$(CONFIG_AVS2_PARSER) += avs2_parser.o +OBJS-$(CONFIG_AVS2_PARSER) += avs2.o avs2_parser.o OBJS-$(CONFIG_AVS3_PARSER) += avs3_parser.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o diff --git a/libavcodec/avs2.c b/libavcodec/avs2.c new file mode 100644 index 0000000000..ead8687d0a --- /dev/null +++ b/libavcodec/avs2.c @@ -0,0 +1,42 @@ +/* + * 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 + */ + +#include "avs2.h" + +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 +}; diff --git a/libavcodec/avs2.h b/libavcodec/avs2.h index f342ba52a0..544cf502d7 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,12 @@ 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, +}; + +extern const AVRational ff_avs2_frame_rate_tab[16]; + #endif diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 71cf442903..0350517493 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,107 @@ 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 const uint8_t precision[8] = { 0, 8, 10 }; + unsigned aspect_ratio; + unsigned frame_rate_code; + int low_delay; + // update buf_size_min if parse more deeper + const int buf_size_min = 15; + + if (buf_size < buf_size_min) + return; + + init_get_bits8(&gb, buf, buf_size_min); + + 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, " + "aspect_ratio 0x%x, framerate %d/%d, low_delay %d\n", + profile, level, + width, height, + chroma, precision[sample_precision], precision[encoding_precision], + aspect_ratio, 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 +179,8 @@ static int avs2_parse(AVCodecParserContext *s, AVCodecContext *avctx, } } + parse_avs2_units(s, buf, buf_size, avctx); + *poutbuf = buf; *poutbuf_size = buf_size; From patchwork Mon Jun 13 03:36:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36193 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp281720pzb; Sun, 12 Jun 2022 20:37:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzagbmqE3Bammxu4FEBLo8bgxkJhmdTIxNh7D3JZvj235wcpJUB3tHXNunr6Vg24A844JC8 X-Received: by 2002:a17:906:79ca:b0:705:111f:12dc with SMTP id m10-20020a17090679ca00b00705111f12dcmr50997900ejo.602.1655091438255; Sun, 12 Jun 2022 20:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655091438; cv=none; d=google.com; s=arc-20160816; b=J/Zj3NDHY+gVi7FDXNZWAUwAEy/t8r4aRnQCTf2NV2KyxVZBJNfVE8gUUEo/rQZjR3 GvoPuLXTiLqykzvSHAprlFajVzKtp/VVHCePRpUEK7URR4CO8oi3NXysUfu+rb/fMWmH zICH0PVlId9uIr9tNB/HBZMMo+9ftOPUcnbPyn6IsvNNmTL1xRji9CX7fKbdcYTPVIHi aB0Y0fmKVwJgwn8ueaH/XwXF5Zzw0Xf8FDdAlYvGrxHvpXNTenJ2oTViUIpqE7bya6fY Xxpdhyh4apih58JkT7yCyx51mcMgwESHbtQ+Bx5JHKPeI2Laux55orBnOtqHuxLARrSJ vhrA== 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=dCX74zrbONynCmvu+hrvtDjM3j98f5USURUOmaGDM+k=; b=cyy19yfDptpXSd5tF36pG70ZIKnsYyJYXmkA2hGpSpJadBk7AuaEB7WS3sXPLRnDF+ ZATIi2bKQ7KULDhqjLrpSD9hKhvjiGlHzRaAhNIJS7xLWXpMawtXBbLdXO62UplYCxWE pydjVQ6mq30o3zNnX1heIW2zsEsHF6HGUHqaVidiRFH1O4GICZKKVWEkZU5XOe1jWc/+ B/qaPSbHkZaDjvhU9+zgVVDYQVPn/7SUhwOEcxZTy8z19naT1VXptl5cjNRi7JWntqbt oIX8/cE3yOClSOU+lWmMSbNn4xGK79EICPFk/lHysHtuBof8J8N+c4Bo/LV93b0GMUhl WzUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FUHlVce1; 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 ay11-20020a056402202b00b0042ddcad3d7asi5886401edb.91.2022.06.12.20.37.17; Sun, 12 Jun 2022 20:37:18 -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=FUHlVce1; 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 A898D68B5A5; Mon, 13 Jun 2022 06:36:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-36.mail.qq.com (out203-205-251-36.mail.qq.com [203.205.251.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326F468B56D for ; Mon, 13 Jun 2022 06:36:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1655091403; bh=9f2uH1p2u/X91wzB24m0vjhAbXoiufcZ0dEmFBmV+qs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FUHlVce1ekSIW+NviaVbtVLnDF0wl+EXj+hsUJiMdyZvIfbl5Bfi4esksE/u0B1H7 bA0FDfOtORUT/3E3IjnCNpkT7r+8UpQvFNhMOtWDDmbWBUKZaWWK8Xs+gm0yacjrA1 DebzL6aGohrie8h+FQSpIHXFPhG3KYRV7g43sRyo= 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: xmsmtpt1655091402twwxydzkf Message-ID: X-QQ-XMAILINFO: N+tZcXNNUKPOQl7+Ut+0mXResVYpoG3hNWNxG7trNo0SjAQZhXAwYDAAouy4n1 QooHuwP+zqd0bvdLd47UWhOwxPz/W4umOHfQwXIkWtRIalFc0eY3t3nqenD56CLjgfOPy4yW7G1w H7hNihQVVbLTrrRInwGm1aHAOlJhP/+zhPCc82XHS6akHooh6pue+r5OH7VJ+lG/aJjaKU3sCRIx zlIrnRkuZLTESMktEBaf97qvM9uRm1aWlE7ErRtsFAlyoiKchaL06aQl8u59XdBB8UAFBjMrxyvB 2j64vHpRN6JbdngZlXYCs4fH2sm/JYDd29I/jf6jDAwUsIwDkk9jXOP/sjJ/Mxj9CPoBDxU2jhdH FkuXeVxtHaEz6ksYye55Cf/EeOjHv1qO9R6aBPIgcnpVR4axduvxANmVZdD1T5SxiRywvhzEgCWY AdSc3wm6/mXe2QZ4Iu+iAXpfYzPu+Va04snfvvfbd9lVjIvV2TWnsZP7iRjVFkx/Buz0fqO5ywaR 4cxfzlt65gAeVwwdnGiQC5a7BveDgOL7Kq4r7Its9tawRQjb2YByaXrwJA4MkigwhFV8Ggh3pE9q bwFeQh4PB7xbtts92JkSiEZsb2fBrKe9gHn0t5e+p1FhPUcO2/0EbXArPqKNVq8kEXofwQTRHWrW FKYfNM70/eQ6gq8Zh/NNVhE6PXgOfMGywJ6GtLwUYqb6KTJgzd8EU723YKimVIZpT/lVVKnBuicb OPlR5vf/mcNv4vK+aXdDTa61Hfw0INP75jPNejJQrW9ngrpPyWR3H1aF8r06d77ZZxWcXIZc1gJn BXcHSK80GlmGvqC4VbnJoKGGj8eRZPBHdLNM9/KW4hHwf96I8H+YZ0wpEHQ89JbXJhKhkNzja7JH x0AbSh8kN01cQykPhMiMb/Z6CzYuvsPN8j+EmDy6t5DhxypdwurCJ8PUNnHwDM4XYt+VrlCg2diu Y79hrRQQyJft2D4w39hg== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 11:36:35 +0800 X-OQ-MSGID: <20220613033636.84271-5-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 4/5] configure: select avs2 parser for libdavs2 decoder 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: XpJG/ZPvK3Cu Signed-off-by: Zhao Zhili --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 3dca1c4bd3..3b60fde733 100755 --- a/configure +++ b/configure @@ -3324,6 +3324,7 @@ libcodec2_encoder_deps="libcodec2" libdav1d_decoder_deps="libdav1d" libdav1d_decoder_select="atsc_a53" libdavs2_decoder_deps="libdavs2" +libdavs2_decoder_select="avs2_parser" libfdk_aac_decoder_deps="libfdk_aac" libfdk_aac_encoder_deps="libfdk_aac" libfdk_aac_encoder_select="audio_frame_queue" From patchwork Mon Jun 13 03:36:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 36195 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp282009pzb; Sun, 12 Jun 2022 20:38:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQf7J6jzOsc3LS/fdK1cKBZpgHXp/dPXJSjNTSC/RK2JupGbUmqBqS0zd9VZn1GONweEYH X-Received: by 2002:a05:6402:3588:b0:42e:6a8:a5d5 with SMTP id y8-20020a056402358800b0042e06a8a5d5mr63079497edc.117.1655091492063; Sun, 12 Jun 2022 20:38:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655091492; cv=none; d=google.com; s=arc-20160816; b=SuCLX+Avh0xciaSoqORMzqOjIsL58S4NZYNuPZUK9wGLNr3Zy3istE7bDmuPCAV+I4 LFOWftwqmnd4eRPHhVDq7aSi3hRSY+2JFI6IK78F4k0og++ok/6zJVuwfsB2XAjP+2IA Onlpt3TyqN6bgd8ZoetVUshtER08AkgaD++6FBd7K/QYv3UYSfhBblKpGRztWRcY3Aba 5l76kYTsTDtmDrbgyLAd3H2LJYnFGQINgIISI0t7wS6sgohH89rZIyz0uCOuAl1ZSv73 C9DfuZHFmtjCdBRc2oIb6GLM4XqgJyYBOyRInd+aGnUs3I+Pg00tRX+uBgNal82mKoFl LfOg== 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=eHtaKzZKGH2iW9u5hEXIRnoSeK+KQ0CZo/Zc0RrEIG0=; b=kvNv6raPR2G9P3r7if2Z1ofJ9RTrkS1SYy/MhVL+WcfZnH0oPDXHEgTpKwOm8VXVRF FLKW/o2kh4zSPWavSiM1bkYhf4FEQTZuzpN8Ny5JWdmhKIvELsNOn9XROjMZ3If08nOF ltotOkCFfP0Eg4KcMXljhcA5TkTJkRHE2VwVOaxfD1WKeiCAHHlnXFFSlbaHP802kqML A19Flmv6RV2kdoYm0AON/6TuSIO2QM+7HnPU43TVoyty0O5fdkpoiiovGvYubgAmlfSn Ox3kQ630+Se34NaBD6v2MO0rjxBTeJAHjyzqBjwrY/QumqquWX282Sf0iXXQQqG0Ikak 41Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=qhCLkwBb; 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 w21-20020a05640234d500b0042defb7235csi7536995edc.202.2022.06.12.20.38.11; Sun, 12 Jun 2022 20:38:12 -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=qhCLkwBb; 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 CBE9468B5E3; Mon, 13 Jun 2022 06:38:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-72.mail.qq.com (out203-205-251-72.mail.qq.com [203.205.251.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CDC668B41C for ; Mon, 13 Jun 2022 06:38:01 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1655091478; bh=2xp49KpODor2cjaO3KzKvCGd0nVf6PJRs3JIEWIhiHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qhCLkwBbZVLUq4AMKs4EqTmyNxq6O8rq0LBmmqeqRQJ1r/WKADjl4c7ip1rLtnkpS hvlO1nCguWc28L1MnhA28NM/1EfUkOgrgc2NqiqpRtlOX5/Ka3IaznUZsinDGWN8TO s4sJyhdots3hYCYc7Jec5GdsS/4h9J/WTLBzN3ow= 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: xmsmtpt1655091403t3ydmxirb Message-ID: X-QQ-XMAILINFO: NSmesZGuqQTYWng4jGpW3mh3qMnz4h0M4H+JgZYp55L18KiXcrIlSE0YnXYlPv 2tDlJ+G4sx/uAiyQ6oqqLh7HAvJhQfYWy7zHw/9gd+SUtZ7HWNe5VKD0eCVR1EBVLzwzxMiQiLd4 LOiD7byPTMaTIoT36ZcQZ5sv6LA9qr9MJd/jIVO8IOVlFTp4rNbvfOUp5pefgFS4G09oCrUWUaBc HWcLTnDK2QsvVS8QmJvYobiL8EMjl4s240cZOO4e/mhaBa3Sw6HESyDuhPlThpR4Y0k02k3ECXgf 8+9od3JKDLsCE7yrJZY+/nmyjCdxtNEZczG9A07mlrzjgrLCnVjFNNoGqYDlP1/yY8hklo0yRadU j07wWrOXsE+fcPV7TIZlAPVPpLxrd5M+fEiV2+xv/50ogFcHChIpzSC4a6rV2awTQH6zwb97+3nE Os1/8h2w4MeQqrF9YHt7qf6IYc2S3Rg1X0EhwUnuMV2I1DzjMaDIX+N/R4ANsRxZKWet9HfzzpWb FYsr48VihqS758ume5MCp9ktoha0zA67EWGzkQc8dIGDRGKm6IH4abCs8Q0ayrNrfGmOMORu+hvj 9S5lV0Hc7xrnSFs//AqlEJ+mc3veBy/Q01cBIOhGcYY3oBz0eztzwKbqRqnUrecrd2og00QeC3sP gVr34fwxfSNjyxht/LMLQKIp+U1mHZb9hawMu72aEYiFa2uYJV4/KmV3rkUa5Cg6r030C5OwyFqH JuINYLT3Tu44ig+EnCFQ0EqAV/1G/xZNvV/3+R1RBo9Bjbiz9wujgmewpHo2HeW8R8m8EdxlLBhv M+4hbZGOB936pxg7W4AziAkUwwv1RqysESaGVVvep7F8kuUEpbANO6JwN8jYfE0GgKXySaar4bk2 bEUYPN35DDWfTKAzKIcf5cCLYDmn8WctBPX6SC4248Chrgde24NClcDP2ChflV7zorpKTa6jJFjl 2rZFzN3nSZAkpn/QH56o0+fMqJT4WekTFoWwgLp2E= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jun 2022 11:36:36 +0800 X-OQ-MSGID: <20220613033636.84271-6-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 5/5] avcodec/libdavs2: use frame rate code table 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: 65HWtslLvFxJ It's more natural than the floating to fraction conversion. Signed-off-by: Zhao Zhili --- libavcodec/libdavs2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index bc31745a4f..d7625718a2 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -25,6 +25,7 @@ #include "libavutil/cpu.h" #include "avcodec.h" #include "codec_internal.h" +#include "avs2.h" #include "davs2.h" typedef struct DAVS2Context { @@ -85,7 +86,8 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic, int *g */ avctx->has_b_frames = FFMAX(avctx->has_b_frames, !headerset->low_delay); - avctx->framerate = av_d2q(headerset->frame_rate,4096); + if (headerset->frame_rate_id < 16) + avctx->framerate = ff_avs2_frame_rate_tab[headerset->frame_rate_id]; *got_frame = 0; return 0; }