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 692F542EE8 for ; Sun, 12 Jun 2022 17:07:31 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7413068B4BB; Sun, 12 Jun 2022 20:07:28 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2030.outbound.protection.outlook.com [40.92.90.30]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 696A368B367 for ; Sun, 12 Jun 2022 20:07:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ek6FvD9rpkbPnVj4RkHGDJ8Dq0PBeoSzJMZgb5uwrVbWwtTnS/GMZKS+e/xiEDdz4jzvocaZfAUm6kzgB7q7kCrBZd4XuIC1YYFIrnME/KR2k5XKMJ6QU9ajFevO8J0lNV3UMpsaKM4I5WiLa1EcU5tl2wGT0BDIOJGYS70QlDlrzk6j/tkBmXBujq0h3ZZEbr3TVMKDXBF15Im+k2pEHWzAMxFTHF7Y/bRkz7ZMqchOxWk3KS04Y3O3I+KH2tEoAyFYFfB4V52EV14Myo/c/KwFky/6iR7oHIM4BfCjqjFKC5zVXyDk7YyBFCdlBJDxORhgkJ6/OzeJNLeLcgagzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JxT7s9+iaN6r0BsE0m2aDa2G20J/vZYviob1ycAZGqA=; b=PJGa3zV4c7R/9LLlQQpUYsGlwVXDRQgYBVyisxXAbxZzSEl0gTMjW1Aq8Z/yPfexS21l7nmeY5CU/BcZ5CRnnAEqSXxzLc75l/fPZXOTm8xTxIT/Ayox7NrdkPVWLhM72yujPch2wCPricV0EbzKg+2MoCIQlX7ReaO3gXHnnie+hlOAqWa4MKl8O+NBMlYO6qyMAkvimMHJ4JITo+2pkHuAMp2JtfPzuEIDOn/Zi0khen2KVxUG4XFPnjZE2ZOkKpX7uaREzouOaPd7aUpaKKF0Wdzw+rJZLE35d39+b9Hw/deHh0hRGL40MZ5LWsvASfeKqDQel3lKncszQi9/8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JxT7s9+iaN6r0BsE0m2aDa2G20J/vZYviob1ycAZGqA=; b=nOnPZVlLOZLJGPsPXclhWUrTxqMB1dzGKxT9xYdr75LHmM2H16yvwiGehu7ZMXuG6SIQZ950nwavMgdQ89V9c5Y8eSuDfqBn2XNOxM3LlaWpjSPCWy8kiz7k6XEUCqEYfFY7oYbWOO6azsy0X3tadOiQ2yqst+IAKYUwNx/YjNFexOS1iz7AxykYYsRh36BEu2ImDXKw4lCaG5jZcuo0ZqG8ni3EAUBgs8J4AiPgiCJqbisxBocia3EsdQ//5SVFfxInwcbfTLCCDDNZDGLDFpDrDuygme9MyplzmOEzztFJtfX6THyymrTfBV0sEwLfWX915qh73tXEWA1CtwD2+w== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR0102MB2846.eurprd01.prod.exchangelabs.com (2603:10a6:802:d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.16; Sun, 12 Jun 2022 17:07:20 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.020; Sun, 12 Jun 2022 17:07:20 +0000 Message-ID: Date: Sun, 12 Jun 2022 19:07:17 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [1TyY7KL+Zhpc3iUdp71ETLkpjqoe2Hwk] X-ClientProxiedBy: ZR0P278CA0133.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::12) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <4ad06afd-ca5b-f5cd-aa41-6a4a86706ce6@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 74ded566-0878-4939-202b-08da4c9602b6 X-MS-TrafficTypeDiagnostic: VI1PR0102MB2846:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j8MVj/1iS93wEpKstiL8duCUP4Yf629nCx/lbRhBTOoQxkWd+0GA/KiwHrupiY0QFMCd2LmWcjOWo/zQV6h11i7utbe/gXmqOjNHOPKPtvr0+HODVm3K09eEr/w3RwFwwg1SxRW/k0qSPRy164nB9vRl4EKEvR3NqcBuxOGION3Kd1lnH1d1sUooGkmt1xYHKOo192qKX4/ob4bYafyOj76LvlY589C1YFk/FcmwwItgvoc4gnrGXSetQupXFqfstKdpQ4rtvTfHcCBb+4tpskHWXqjVNb90B9nRCFkWSBk2Nhfxz+U6J8r7XxnexpGZwCbTmrCFoydISUpW2hh2b6TkZuXtM93CcR6VYDzMxUu7V8DW5cFJxhIK8EGd98o1gWz60ZIJfNimignGn3OF+QwOfe6UMgZXGAUMEnwDoQuKXYOKIU8yqJHqv4Eb7ORBvcglXyp5brOJr1FAlOcWNTTvsvbsPlDACeKp6/SVfUAFJ3lSk1YJEdXnwZHQglsuw4SYVARX2pAE+FnDuYXLhzjNNwf5DJCpSTi4HaXL2IMkES+5TLI2dgr1FgGILATsZPB19+v/EPuDYKf1ro+MpA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SGE3ekNIWDU3L0dPbG5rYXdLMyt3VXI1SzRtU3dyOFFSbDZZMUc0aUdVc2ZI?= =?utf-8?B?NjVjZFpNWU9NQkZ2QWlWd3FjM1Y0R3VZNzhXMWtublQ3OUFkaGl4UG56d2Nw?= =?utf-8?B?WmNjOWhlTUpvRk11RWVZeTMwRHloczhGeDBBSXgyR3AzRWVUMTUwaENQUUZK?= =?utf-8?B?cnJzWWJya3FiUzB6RXJWbkpaSDlXaEwzdFlMNkdqZVVSNWNDYkxleWZaaXo3?= =?utf-8?B?OU16SWVVcmx1ZEVuQXhSTERkRVlRa1VxQlZpcVdueEllWHpMM3BJZDFiQ1FJ?= =?utf-8?B?N2ZlZm4xdmpESU9jZFJ1c013b1JleERuTUFSaW14ZXlpRVRYQlpRZjJBay9n?= =?utf-8?B?eHdxbXBZM3UwMlBoYVpOYkhES0lsVE1PekVFTTBKYzhHZUVnZEVOeXZIUytP?= =?utf-8?B?UnN1SHRyazRkWkRvTXNERFVkMFc3ODNUdG1GQVYyY0x5b0VrNkhIcUlQOFJG?= =?utf-8?B?YXhvLzlPVkZqOXN0U3pTaWtkVlpPNFFTS1l2NVZXUXJsVkpjd09xUk1WOHpT?= =?utf-8?B?NWpqazFaRkhZQ3dxTmRqRnc5UUl0ZmRxdDRqSG5md2pMaE8zbjRmdlpzN3pt?= =?utf-8?B?cWpHSm1Wa29aUkZ0YWhSZmU0NEFiNjJrRUtOT2xDRWl6M1FhSE41bHZMZysw?= =?utf-8?B?Q3hPdUtpaVV2MnY5MmZjZCtwWTBLQ2YvdUlLOVhNZ1ZBbTJkci80NWZHZ0hw?= =?utf-8?B?ZkROdkpYeWdaUVc1N0xvMFFUVmpDSE1BU1NzNGdrWWYyQk5EQlZ2Rk5ndHZO?= =?utf-8?B?azlkSEZ2dTU0dTlkeVdvb1g1VU11V0gyMHMxR1ZIT0FSbHJ2Uy9Uam40QlR2?= =?utf-8?B?NFlpdDQxUFExK25xZ1BNN2MxT3BOY0NCMDRTTzBPQ3JPVkNIY2NGMnNXOER3?= =?utf-8?B?NHRqaHZ0NkNYK1hMVWZwQ2EwZHhGenJSS1d1d014R0syTWlvWVFKQzVkakg4?= =?utf-8?B?UFNlNVB2UmFyUGllL0dvc1JTdHVBMkJhT1paRE9sWHYvR09tNkxRTDRJSHZS?= =?utf-8?B?NlJpMStiYXh6d1oybjBoKzZjWll1dU8xWThnSnkzdUgrZlk3cVZXOW5jZ2Zv?= =?utf-8?B?Rm8vNzR4YTA2TDd0N0p3K2hQZ2ZEanhLc0wvWmRIcXZHU29tN0ZMRWUrSmNH?= =?utf-8?B?bnhzaGZ5Tkt0WVVFTzZjYW1GREZiY0hHRDNZRXdXMzRZZUNPTmVSdXVyWW9K?= =?utf-8?B?QUpMcVJjemhpaW9WeFBkTVR0aDFIQ3RtSytlaWJZMEZxUTAzSFh5SmpTN3BI?= =?utf-8?B?TUV5WXV2SCtFT0QxN1psNnN6ZFdFdTljdkZhQ0lDS3h2THdFNVZWVVloQzIz?= =?utf-8?B?S1RLMkR1L0k1SkZkR2NIbFBMU21Vc2JlbExFajg5ajI5dnhkWmNod0FZb0pr?= =?utf-8?B?a2xLQVZrSU5mU1BFWFZ0R2t0bXlXeW4wZlEyMW1RRkNGakRtTUlWVFZtbUcz?= =?utf-8?B?UHhybXprRkxtZkU2OGtSdTNZb1YvdFVBb1FIMkFJT3kyMHlEYk43d0Q2ZzVJ?= =?utf-8?B?NUtiakEwSDc5Q2VDS0F6c2JxdS9MM2ZGdzdVZHhKSysycFcvbnRzbkRtNlJR?= =?utf-8?B?WUE0ZC80cEcycGEydHRCeWJEY3ZuUlVseGNqbGMxZnZRZ09seFhFdVJuMThi?= =?utf-8?B?dlV6LzR6ZFVRdklEUjZEcHV6UUx1Q0dFOWNlZkJ5ZytaZXdGU0dTbmIybXBl?= =?utf-8?B?ZGZVRi9sYngyRHFwTkh5N3lpZW1hS0tuYlVIdjRROTM5bHJaMWRkbjZkTzlD?= =?utf-8?B?ZkJaSUdWZ0ZEOXFSekw5eW1Wek8wUmpwRTdUemJFaERMYVdwQzFiYXg4VjF6?= =?utf-8?B?cFl4cDU3R1pURjNSNXFzaHBJeVRSWW5UZFNOeUF0SGFwQ25ZYUpSUzV6eVpV?= =?utf-8?B?R2NBQ2h1LzFlcGwveEZ1ZWEzYmR1WlpSOGVSUTJwYndaSDRjU0wrVDhNM21X?= =?utf-8?B?cHBmalNpb2hJQW12Mk4xSjVOOFZhUkVDQ2toaEl1S1lIcXlKalBtbk5JRFJZ?= =?utf-8?B?bEEzV2t4cHNRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74ded566-0878-4939-202b-08da4c9602b6 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 17:07:20.4392 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0102MB2846 Subject: Re: [FFmpeg-devel] [PATCH v2 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 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: Zhao Zhili: > Including video resolution, framerate and picture type, etc. > > Signed-off-by: Zhao Zhili > --- > v2: fix unused variable warning > > 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_Hto > > +#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] = { If this is only used at one place (as it is), it should be moved to that place; if it is to be used in several places, it should be moved to a single file instead of a header. > + { 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..18d7729768 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 }; Missing const. > + unsigned aspect_ratio; > + unsigned frame_rate_code; > + int low_delay; > + > + if (buf_size < 15) > + return; > + > + init_get_bits8(&gb, buf, buf_size); If buf_size is gigantic, init_get_bits8 can fail. Given that you only ever read the first 15 bytes of the header, you can avoid this by initializing the GetBitContext with a size of 15. > + > + 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 +177,8 @@ static int avs2_parse(AVCodecParserContext *s, AVCodecContext *avctx, > } > } > > + parse_avs2_units(s, buf, buf_size, avctx); > + > *poutbuf = buf; > *poutbuf_size = buf_size; > _______________________________________________ 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".