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 0138B4457F for ; Sat, 20 May 2023 01:01:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C34868C126; Sat, 20 May 2023 04:01:03 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2032.outbound.protection.outlook.com [40.92.75.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5EAF68C0AE for ; Sat, 20 May 2023 04:00:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CD89mVKgk8oGgNi4uwrParHTRpWHuZYa+KxIQ8jHbS9bC4661eLh8dguLlA9yIU5tve8TPkAwXts8Qfk1emOU636VsZn68cSuYIOMj0H+l+Pbni5CknuPVVFDmL+y1cdqAzWjUoj8ICQhwdD6Uiwz+yfHDSdUfKpjyggBD6CSdA8eJcbjAOlxFs0wE0wyAobrQGq5rk8Xd3X6003QfXZr3PYydGjO7L4cgQi7m32GbXzHaRP+C6gi/I/dZaoBjxfXH14xGqiII6NQ3m36bDe76ECYMe5Hd99PTSa9BI9I3Ul1AFw+GAOd8ls+7T4Iiv9c4cKNouADbnmub/X0QK3Kw== 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=q/ekFr7d7zCvwHB49i0105ZneH0wEKVTkAqEo5yTZzo=; b=O1ypK02jZVSMYh34glb7BVvvOqDU7pSSy5oW+B1CIg+LqB7kI6f+F3FSzxex5OGyCJF7IMUjSKTEQBtT0ZJlLK0C2QE43tNdJtYjeRSZU5Vik9b1nn0dltm0QiFf7ldwz3DrdqtzwAJaDTikpuDGinqldoJHB3UobXUovURpk+Pzh11zPKCy9ofWgBgBupJJNNiRDou3cXFUwwJccH8RxlDZ1v9aA5ynrV0NpoBAY2YPbG8wIJ41NlRJNm2ivL6T/nFsQMgxzw/gbm4HbkUfLNCtZlqrYpIzJzeQv6clxF8TITRgcHoi63COszPaPOJmJKvG7N+XnydnsVhc1OeVNQ== 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=q/ekFr7d7zCvwHB49i0105ZneH0wEKVTkAqEo5yTZzo=; b=XBo9KELsdVtoX1acRfht4DpBdUtx5NtfSj8DxvSzarwOJLsEy0a3DanXNBHSDeWRHE1k5rh8WIPn0+Iz+y5Vb8lGRJPdBn9VFXjPodHyUjC9ZA84vaLAnxIgtIb/20io0WLYz9LOdaKi68xIEap3QAh7FTOMdvYgr3KwdPgYUSRc+z/owlMixeKNOe7q3eJ08cUkMm937Fkv1wM1u5Ji8WPxMICmUr7ftK7MGaFpovdveJvzwK6dYtaG8nyEP+UvKyUUoMzArVIM+b2dEO9fUrxNm6UFiH4PwMFBGnGQHVV2u6mpA2C1KYSYfMXNnlkdAa+L3Xj5ptHEbf4tM57d+A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0096.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.21; Sat, 20 May 2023 01:00:53 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::ca17:cb7:b20d:3b65]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::ca17:cb7:b20d:3b65%4]) with mapi id 15.20.6387.032; Sat, 20 May 2023 01:00:52 +0000 Message-ID: Date: Sat, 20 May 2023 03:01:36 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230519235907.4321-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230519235907.4321-1-jamrial@gmail.com> X-TMN: [8qbXKpHMpFnBRaByFGM+1vNmObeL301N] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <9c19d850-6194-d03e-84a3-ed718f5a86bd@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0096:EE_ X-MS-Office365-Filtering-Correlation-Id: ada01556-e38e-4763-f347-08db58cda8a9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: daXnN25oCEI66Z439Ve4TqMKBvCwTJkUXc/oYqbvaoQ21RSdD28SzJ/RdvEdo2JWKum4LE0ng+74aNrI6zST+ijcpkCwve/9/tU5oI+JNIFXHvTXuEOC9CKf6WyC8J5lCoHX7h/yl/Fs+XNdEAL5bTbmyMfwZQQ7oq3LXke90PcJtE2UXklxisrTRntvpdBV98jWm8oM04aQkrir6VirTTcKQ7Im8r9JJdIMSFrco8zlIOcrVLWA/3z5FxPzAjx8+Bf1ebSDaz0VmivXDN1KCv1CG6pSgkjwfyum2rk4EvAR6YcHTeYURCAr3NGx0B2NPtDHr7gUIXVGCCVoqSwxmfB7tyktkzKvW/it7LjqhImOvUfTyilhr+1lwZJd+SuMp9AM/PL1OqgH+brCX40VwJFAX77uhE0ZRkhMMo64qJ+8CZslq/O6xggXv9WwrkwEUPD/KLEC83lGA9zq6F+illvWo522q8JYxXku9B8ax4p8dedldYuqJG76Cu12Fm3W75dkQ7txo7YV/VOqOGfU6QtlqW3V1IHEUDrF94TmmC3Mt6kcI23Pl24WdFHjLx7ToP2DANaOfWLzO/Xt7nnB2qIcRbRafDe8t62JEToMxtKJkn0LyhCZyr6pzsqNFFII X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Zk1IZUxmNGhCemdHL0tTbklNWGJEZVdpc0VGb3JRMEdTM2ZFZlg5QVJ1Vmpv?= =?utf-8?B?RThsek5hYWFJMmJmTXZVcVFwN3RIbFVJcm0xTm1FaWtGWWRJaW14V3BHbWNQ?= =?utf-8?B?aXJSL2xHVkVETk90anc2V1JLZGwrbW1xTHZZVkdONk9rZU9FbTNFRWd6b2dF?= =?utf-8?B?UWJNTlBpVTZQNXVFUzJCMmY3SDhzeGZlTU9FSTBQcy9Gcnk0Si8zVkx6QTRq?= =?utf-8?B?ZFFPYTcwaUJHQ0JzVUJtYlFqMFFHSWxjZzI4MCtSay9xV05JSDFXNG8xclFN?= =?utf-8?B?VGt6My9CbUVoeHEvM3VxbXMyWm1hblR4eXRFSzQ1THRlRnNDbUh4MVd4TFZC?= =?utf-8?B?VHJNQmJKUlhnMU56MFUwNmZnK0VraFpUMEF1Wm9YeU8rOGdQNnBHMTdKMGRI?= =?utf-8?B?a2YvNzR3Vk90VjhjVVJpRDdOVERrVGVma3lXbUVqTEhXd05YM1dDK1FHaWtK?= =?utf-8?B?enhsN1lSQXRWeGJ3MXo5TlB2M2F6Y3ZXSjdhSHlyZWJPa0I4UjF5RGc1T1ZE?= =?utf-8?B?Sk8vaGc3VnhBN2s0c2lSWEFvbFdOUnpzaFk3dE5UZjBNMWdxNCtnODRGdGMw?= =?utf-8?B?ZXJtcVhNOTExT0RsbnlwU09PTm5henFVcHpqNFNCZXpsc0hwQTByeFB5QXp4?= =?utf-8?B?K3A3WDd1enBLODJBYlZqemx4cWVydTd3SFExNlQyRmdFNVVTUFJCaDNOZGJT?= =?utf-8?B?Z3NPcFNTVndDYzhHOVJsaVJ6bFMxSUpyTG1iMmZUbUdvcjRXQmJzSjIrMENX?= =?utf-8?B?N3V1Z3FjQnpKNDB1SWFJd2dWdW9mRlp2cm5vTUZVODBzTEpQTGRuQ2JSZDFZ?= =?utf-8?B?ZE5Ba1NCSWMvc3lSbURKQnR3aHJ4NW13K2loQ0hxa2kxQjhlUWRLeWg3dTlY?= =?utf-8?B?amx5SnpRbGxBbXd5RXA3SmFMb0RLaDdVZEVmZDB3MW5oVUQ3VHZnWGlaK3N6?= =?utf-8?B?N1g3QW53VEFHZG41UTc3ZE4zdittSHlIK3FzSXlLbVBjbnI2bkxKOWhKR0pj?= =?utf-8?B?ZCtaZUd0R29ocXV1dkY1bThPeXkySE9TKys5TXAvL0FMdm9XQW9TTTViTGRD?= =?utf-8?B?ejdhYkRNSkdldmF3UzVqQVdSdVB0NFZ3TGJXbmEzVkpiUWZYNTBYdmhXVFMw?= =?utf-8?B?Q0gwQlVlY3RMWWJicUFrT3A3UWZTamFCMUhhbFNnUXRWZ1VXTzRrRERIZUVU?= =?utf-8?B?R05KQXN0TzhrL2R3eGZmSDRrT0dtUVlTdWZaR3B1TzAzQjNnYmhGMHNwbTgy?= =?utf-8?B?K3JrMjFmTmhWUlk5MEcxdWNVdisrR2FKOEVINmFFTzB6ZWdvZ24yZDZhQ2dh?= =?utf-8?B?MlduaTFMcndCRUtWaDRiY0V3RXpWOGJPZ2xPUXEycWZaYjhpZmRBQzBFakM4?= =?utf-8?B?Q1pJSWh2RjVHL2RpQWp6UWdLUElzNkhYb2dmK1dSaU5FV0pBSDExN2xDejEw?= =?utf-8?B?Q0pCODE0SGd2OGdmcWduWmsvc2NVUlp3MElmNjg3WFRPQjhaNTRqVTFsUjlS?= =?utf-8?B?T1dsTFVXSXJJcTRpcjNwcXhKRnlGZmJtanorSThXK3hyNWR3SWNadEwxYk9z?= =?utf-8?B?endIV2RiaElZanozNmF5M211L21Bek4wWUkrUFlUUWFTRUp0aUhuOU95bGxL?= =?utf-8?B?cElua2VQTTFpdTJoRUxudW9NaGZGeXhyd2ZsYUJWdlYwdEIvdHZiWjM1M0ZK?= =?utf-8?Q?XIfufb5ZRH1mTdapRkTy?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ada01556-e38e-4763-f347-08db58cda8a9 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2023 01:00:52.7401 (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: DU2P250MB0096 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/av1dec: convert to receive_frame() 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: James Almer: > Signed-off-by: James Almer > --- > libavcodec/av1dec.c | 75 +++++++++++++++++++++++++++++++++------------ > libavcodec/av1dec.h | 4 +++ > 2 files changed, 60 insertions(+), 19 deletions(-) > > diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c > index d46ee48335..9344d4ff28 100644 > --- a/libavcodec/av1dec.c > +++ b/libavcodec/av1dec.c > @@ -657,6 +657,7 @@ static av_cold int av1_decode_free(AVCodecContext *avctx) > } > av1_frame_unref(avctx, &s->cur_frame); > av_frame_free(&s->cur_frame.f); > + av_packet_free(&s->pkt); > > av_buffer_unref(&s->seq_ref); > av_buffer_unref(&s->header_ref); > @@ -767,6 +768,10 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) > s->avctx = avctx; > s->pix_fmt = AV_PIX_FMT_NONE; > > + s->pkt = av_packet_alloc(); receive_frame decoders may use AVCodecInternal.in_pkt (this will also make unreferencing this packet when flushing unnecessary). > + if (!s->pkt) > + return AVERROR(ENOMEM); > + > for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { > s->ref[i].f = av_frame_alloc(); > if (!s->ref[i].f) { > @@ -1042,7 +1047,7 @@ static int export_film_grain(AVCodecContext *avctx, AVFrame *frame) > } > > static int set_output_frame(AVCodecContext *avctx, AVFrame *frame, > - const AVPacket *pkt, int *got_frame) > + const AVPacket *pkt) > { > AV1DecContext *s = avctx->priv_data; > const AVFrame *srcframe = s->cur_frame.f; > @@ -1079,8 +1084,6 @@ FF_DISABLE_DEPRECATION_WARNINGS > FF_ENABLE_DEPRECATION_WARNINGS > #endif > > - *got_frame = 1; > - > return 0; > } > > @@ -1145,22 +1148,32 @@ static int get_current_frame(AVCodecContext *avctx) > return ret; > } > > -static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, > - int *got_frame, AVPacket *pkt) > +static int av1_receive_frame(AVCodecContext *avctx, AVFrame *frame) > { > AV1DecContext *s = avctx->priv_data; > AV1RawTileGroup *raw_tile_group = NULL; > - int ret; > + int i, ret; > > - ret = ff_cbs_read_packet(s->cbc, &s->current_obu, pkt); > - if (ret < 0) { > - av_log(avctx, AV_LOG_ERROR, "Failed to read packet.\n"); > - goto end; > +again: > + if (!s->current_obu.nb_units) { > + ret = ff_decode_get_packet(avctx, s->pkt); > + if (ret < 0) > + return ret; > + > + ret = ff_cbs_read_packet(s->cbc, &s->current_obu, s->pkt); > + av_packet_unref(s->pkt); > + if (ret < 0) { > + av_log(avctx, AV_LOG_ERROR, "Failed to read packet.\n"); > + goto end; > + } > + > + s->nb_unit = 0; > + > + av_log(avctx, AV_LOG_DEBUG, "Total OBUs for this TU:%d.\n", > + s->current_obu.nb_units); > } > - av_log(avctx, AV_LOG_DEBUG, "Total obu for this frame:%d.\n", > - s->current_obu.nb_units); > > - for (int i = 0; i < s->current_obu.nb_units; i++) { > + for (i = s->nb_unit; i < s->current_obu.nb_units; i++) { > CodedBitstreamUnit *unit = &s->current_obu.units[i]; > AV1RawOBU *obu = unit->content; > const AV1RawOBUHeader *header; > @@ -1168,6 +1181,7 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, > if (!obu) > continue; > > + ret = 0; > header = &obu->header; > av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i, unit->type); > > @@ -1251,13 +1265,15 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, > goto end; > } > > + ret = 0; > if (s->cur_frame.f->buf[0]) { > - ret = set_output_frame(avctx, frame, pkt, got_frame); > + ret = set_output_frame(avctx, frame, s->pkt); > if (ret < 0) > av_log(avctx, AV_LOG_ERROR, "Set output frame error.\n"); > } > > s->raw_frame_header = NULL; > + i++; > > goto end; > } > @@ -1361,6 +1377,7 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, > } > > if (raw_tile_group && (s->tile_num == raw_tile_group->tg_end + 1)) { > + int show_frame = s->raw_frame_header->show_frame; > if (avctx->hwaccel && s->cur_frame.f->buf[0]) { > ret = avctx->hwaccel->end_frame(avctx); > if (ret < 0) { > @@ -1375,8 +1392,9 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, > goto end; > } > > + ret = 0; > if (s->raw_frame_header->show_frame && s->cur_frame.f->buf[0]) { > - ret = set_output_frame(avctx, frame, pkt, got_frame); > + ret = set_output_frame(avctx, frame, s->pkt); > if (ret < 0) { > av_log(avctx, AV_LOG_ERROR, "Set output frame error\n"); > goto end; > @@ -1384,13 +1402,30 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame, > } > raw_tile_group = NULL; > s->raw_frame_header = NULL; > + if (show_frame) { > + i++; > + goto end; > + } > } > + ret = AVERROR(EAGAIN); > } > > end: > - ff_cbs_fragment_reset(&s->current_obu); > - if (ret < 0) > + av_assert0(i <= s->current_obu.nb_units); > + s->nb_unit = i; > + > + if (s->current_obu.nb_units == i) { > + ff_cbs_fragment_reset(&s->current_obu); > + s->nb_unit = 0; > + } > + if (ret == AVERROR(EAGAIN)) > + goto again; > + if (ret < 0) { > s->raw_frame_header = NULL; > + ff_cbs_fragment_reset(&s->current_obu); > + s->nb_unit = 0; > + } > + > return ret; > } > > @@ -1403,7 +1438,9 @@ static void av1_decode_flush(AVCodecContext *avctx) > av1_frame_unref(avctx, &s->ref[i]); > > av1_frame_unref(avctx, &s->cur_frame); > + av_packet_unref(s->pkt); > s->operating_point_idc = 0; > + s->nb_unit = 0; > s->raw_frame_header = NULL; > s->raw_seq = NULL; > s->cll = NULL; > @@ -1411,6 +1448,7 @@ static void av1_decode_flush(AVCodecContext *avctx) > while (av_fifo_read(s->itut_t35_fifo, &itut_t35, 1) >= 0) > av_buffer_unref(&itut_t35.payload_ref); > > + ff_cbs_fragment_reset(&s->current_obu); > ff_cbs_flush(s->cbc); > } > > @@ -1437,14 +1475,13 @@ const FFCodec ff_av1_decoder = { > .priv_data_size = sizeof(AV1DecContext), > .init = av1_decode_init, > .close = av1_decode_free, > - FF_CODEC_DECODE_CB(av1_decode_frame), > + FF_CODEC_RECEIVE_FRAME_CB(av1_receive_frame), > .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | > FF_CODEC_CAP_SETS_PKT_DTS, > .flush = av1_decode_flush, > .p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles), > .p.priv_class = &av1_class, > - .bsfs = "av1_frame_split", > .hw_configs = (const AVCodecHWConfigInternal *const []) { > #if CONFIG_AV1_DXVA2_HWACCEL > HWACCEL_DXVA2(av1), > diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h > index cef899f81f..59ffed1d9b 100644 > --- a/libavcodec/av1dec.h > +++ b/libavcodec/av1dec.h > @@ -28,6 +28,7 @@ > #include "libavutil/frame.h" > #include "libavutil/pixfmt.h" > #include "avcodec.h" > +#include "packet.h" > #include "cbs.h" > #include "cbs_av1.h" > > @@ -68,6 +69,7 @@ typedef struct AV1DecContext { > enum AVPixelFormat pix_fmt; > CodedBitstreamContext *cbc; > CodedBitstreamFragment current_obu; > + AVPacket *pkt; > > AVBufferRef *seq_ref; > AV1RawSequenceHeader *raw_seq; > @@ -90,6 +92,8 @@ typedef struct AV1DecContext { > AV1Frame ref[AV1_NUM_REF_FRAMES]; > AV1Frame cur_frame; > > + int nb_unit; > + > // AVOptions > int operating_point; > } AV1DecContext; What's the advantage? - Andreas _______________________________________________ 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".