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 175E945F2D for ; Sat, 20 May 2023 01:17:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 633EA68C11B; Sat, 20 May 2023 04:17:07 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2040.outbound.protection.outlook.com [40.92.73.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69F2968BF51 for ; Sat, 20 May 2023 04:17:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AQQqoDFfyTyXv2x5QUce0aJTDfvqy2CeisTfdn0bAvqu7iLGQmscXCiV9myhPuwpZfDC0NDgkSPKqU+HCC87FKqqV9koqPDoZ+plmj2YsReOowvkcPX5HaId1A5xOKOZVW7OKN/kiAhGBOO0zGo6eqXLzNbpmjIzBvyK4a0aDxF1fDrgcvhSsRaW8cY2xMtDVEJbBhSaY5fs0yRtKx8kVqDmYT1R8H2kcZrgAHRYMHpr8JBWVlHK/Ig9nKaCrxlHfNKTWz3kZg6a3DQxs4oCqASLXqIq5nnfae04303yuQvF99cWTguZ3KfCMsYk4+BRZ58gItL4ErNDX/yfVF1DFw== 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=GctOa785LRxcu62oKEeyan1FLGpeBR2TGk+gR83PsQw=; b=B/USEVhUDiUizXa7+YROMuwjRL9EB7+3U96QpOeVPIejv2C3KdXz5QvfYpVrTDfvnTIyoUo/gX6vP8q1aoY8ilrZdHE74FsBBclUjpb+za1yC/b6RRPPH7CHs1eqIhidaGPKPMt4Ea9j1N/Cj5eF0brNmYsPzMa47MQVSQdl9MH7qn0jCJKFsETX2G8RcLiXlKNuWG4XPQMuvrG2U+ZUG0qAGFVZMDlrVk8phH0vgtUhIfijKz3LjuisMANs3J3F3YU5jYartgrzYBf0YZ88WDwHRkGgkfUYUtmRTLArczYKUZijq4Ovw/BjJUaXNDwv13KwTv/uPoGqKxi/2IEKPQ== 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=GctOa785LRxcu62oKEeyan1FLGpeBR2TGk+gR83PsQw=; b=kF7JewPYAEhy/8/+eLJo4AsBQXOn5sIdPZF+c4gnsvaVJY9V9Ybf4OXnW30NjqbafWEkcKwAVVcMzRCUDddpqyc1lrgXXebLCkCuCSABbyZYl5fPW3/SDEnLwj89Tk0FgKNVgqnScGhzV0E1yIH4rrnjHaPoBCCavvL9EDKn9Rq4hLdT9jxdOvVboOTCOj4UFY1bo/sxmqMBdef8ibtXpkFMSUIyZjCi93gmYY2RfK/zmuvxYU8pBnq6bjJMrsiUB6Ty/7IQ5mXXDfk4TOmkmcp5iOmaUrGjuupT5Zd3CuIVWOpYKw2lp0DVLG7gFSI8Wob7dwgLeKMvWO0qzS84Rg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0412.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:344::12) 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:16:58 +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:16:58 +0000 Message-ID: Date: Sat, 20 May 2023 03:17:43 +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: [FrhQ7WZa8V1MgtJ9aM5dr/I9OgKBQ3gs] X-ClientProxiedBy: ZR0P278CA0198.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <25da9975-f494-58ea-0411-de784c99dc16@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0412:EE_ X-MS-Office365-Filtering-Correlation-Id: e1ffe63b-fe8f-461b-3923-08db58cfe894 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5jc0WhpO5bphdIGr8geaA9pWxncRNwr/wMSKh7aPpfZMj6/1gYpno4MO5m73LnPFRW5tWgMCwLHTDAvioh3FUopgt6iCAmRWTMHkBXsNeKRnLbm5/5h/wEJ1vH8Jxu412NPsptb1YXYyQrES6CQhOY/0I6blV4/gCwM0JId5722Wtrk5h3Ei4a0/TgVOKgM+wBkM31HGuKrppEtXWTu5UH6CbvVIgEx4cwTT3yEv+KqNHDToF6KE9B5QXVP9PogXalVpV1TtgZ7l+LFtPZC41v1eNikWS6/Vh51jxD0WpIx0gX/NBhKBTCC/zkeXmJK9zvR5LypreUoaS8gUL6KXekiGdjI3ubs2QcDM5cnrhouV8PYKyHGlM7p/7Pa0VG+EJGlhnXpvKcUDPae1MASYEYMfS7rFbeajwVzcErOzLXAk1YNvmd/Rvh4PYyf9MGxQMBNSOLgv2KWaM/7f0svlnQKCaEKE9fGpLMZhV8K8IzxWthC9TGTjcsB1roJ0cPYKRX3RqFb1NxZhICc4x3//fmedugHyvuM8pmtWJJ4SaUVO4CaGtMK7iRn6cDNb3p2UvR7FFgEvqXY6BF36XiB949w7nh8GZnA5PxoJv+APD7PfnPrdYc5BysJ60OTaHUlL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VWJjNjRBZHl0MUI4LzQ1ZlpFNXU5TzNWSEx2UDhjTVNFelhHY3ZzSzhFWk9k?= =?utf-8?B?SHNUYkE3VGRDN0YrVllac21pV2h2L2R1eW1BdStPM3k3N01yTW0ySG5uNmFS?= =?utf-8?B?TWlRR3IrbHpqQ21ISUFwdGJ4K3J1SWN1SVlIMSt4bE1vSzM1KzZZVnNSbk1p?= =?utf-8?B?c0ZDaXVnRnRKR3BQOTcxNEFxTzlNemFkTHF0MHg3RU1JUDU1bE9ENWp4UGVp?= =?utf-8?B?bUR3cERuVnhWUmhLQVFLQ09jNHpYRklMS04reW0xVzM4aHZjM3ZHRTBCVVI0?= =?utf-8?B?SHR1eU0wL3BraTZWR2krNk9aME83NUJUOWJGeFJTVkZZdFNXUkw5YmlMZ3dX?= =?utf-8?B?b3A0UmtPWXpuL2R2UUVXTFdqL2tVa1hlRmFVRk5oVVc1blhlZUNiSVZ1TnI0?= =?utf-8?B?dmFzS2lSTzFQNXZqZVN5cDZQcnJYZ2piOURVa0t1RE5paFVWSUVveUJQUDZq?= =?utf-8?B?ZkE0NGdXS2FHd2RVRnFjTC9SbVhiM3FEWTg4aXJsT0VjL2RSR3RBMElwM2VS?= =?utf-8?B?cHExV001VEQ1dHlSSGVuWnBXSnV3bzNCL04xcER2bzB1SFpub0V4eGFZbWdq?= =?utf-8?B?TGJ0UHE1ZThpRU1yUGNvaDUzRURHNU5zbjJNVTNNN0lhTlNxcHN2d2lybzFB?= =?utf-8?B?V1BKbE1reW11dE1vTlYxZ0hzUXNaalNkSk40TGtkYU9WT2srdTBKdTdVSmlL?= =?utf-8?B?Q2RWSWxGRHplWVB0Z2Y4aWowZ29yUGdtOEllbXpxYUFac2NMZVdFVnBGZllW?= =?utf-8?B?RmxGdkJGUmRxYVRRMWt1aUlnc0d6cVNwb1FINi9pUHA5MmdjZ0IrK3Y5dmdr?= =?utf-8?B?bGxlY3ZydDgySnkzL1R5ZzBDeDlXakVJRENmdWlFalp5NFcxcSsxTFc4cUFy?= =?utf-8?B?alRLWmdLVEVaWGJLSUU0bjlXNUtFbXowb05MZVdjSXlLbjAvdVhvUG8yT0E3?= =?utf-8?B?ZkV4eDRtMThMVHpiWnpNMnhnSW0wVFBlZzhmVG9pNDRmTGlZUERydkVlZFNS?= =?utf-8?B?MTNUTXpRSk0rVlhmK3o0RTdlRFVqeGJDTDBJd3ViZkVnTVllbitadUpRd0s5?= =?utf-8?B?QW9FM3FPbXc1YWM3OXlKMXYvWHJuTEcwcUwwcFhLWHlSTkdHQTRlZis2QWFI?= =?utf-8?B?bEEzMXU1b2taZ1l1MitOWGlCV1RxR3gxY3F1bU1oMVcyVEVya0NwOVVUSWNz?= =?utf-8?B?US9veDdKYlRoR3gyQUh5VnZzMzAwNVB0UHhtcjdhVTBSQVRVQzh0eFFwVGFP?= =?utf-8?B?Szl0ckRjK084Mi9FYmpzcytxVVFNa012TjdqTmhwN3ZvVzF1Z2Q3cHN2ckE5?= =?utf-8?B?Y1A2YnJyOVJsQTJIUDhBVkswWHNRTEZlNTFFZkZOVlRxS2l1SHMrdW5icGhm?= =?utf-8?B?Q1BGU29COUhxampZaG9nUEcyRFpEZnhTZDRrRjlqSkxmRkUybUJpcmFUOUJN?= =?utf-8?B?MkVLMmFtSFBKYzVITUozckdpZGFhdC9Qc25jeEtlQ3lKMFVWVXJEOGs1Zy9H?= =?utf-8?B?TGNPNjh5VDBpdmY4c1JHY3orakVLUEtVSXZUTHNrZnBSRHpOMmNvQ2dsUEdV?= =?utf-8?B?OEZreUR6eWVwZGhMUXJYZ2dqTGFrVy8wcEdRUXJncmpGTDhXVVh4N1A2RUxu?= =?utf-8?B?K3E1QlBqVjFuWlNLamxFejVxYTJLQWtPbURRZHYvTGtTRjBvemJOU0ZkWFdH?= =?utf-8?Q?wYSURBO+YebDis5cEDIo?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1ffe63b-fe8f-461b-3923-08db58cfe894 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:16:58.8704 (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: DU0P250MB0412 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(); > + 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); Given that you unconditionally unref this packet, the packet given to set_output_frame() will be blank and the timestamps derived based upon it useless. How have you tested this patch? > + 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; _______________________________________________ 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".