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 1757D491E4 for ; Fri, 9 Aug 2024 23:52:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F30F668DA01; Sat, 10 Aug 2024 02:52:51 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2061.outbound.protection.outlook.com [40.92.91.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21B7968D92E for ; Sat, 10 Aug 2024 02:52:45 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XPbdEOW0/sayr6uEDYtF7Bf9grBASsxtSa6yePwdPlYcrzG8iu4WNBMTE8ql+LECkoskfvsM3DMO7HS/mKP//c195ydZMLwc83WwaVQJ+kcNiRFouDeXoWELag7PEWtEY2WjhTAOoJdsG/nG1rbr6XeelqRleoOcl3ZAIfrnQyaoigpSAOWRqaeW3ScCUE0zcVakfOJA0fmMFJzeJBwGwrMm+Vzr697/GANUnHesnFFGSxMmm48IrgHA2szL0lMAZwo/75uBSfU70x0rbEKHUj5eb2zUWwjGXQpgWE6ThZf/iuNMH07dhl4oPhXTACDZvg/IPMBlFkQmcNsbF+hlyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=cLuFN7ETSMdsDML8QA4HWFOetfg3FG/JhWZcJn/kG8g=; b=BPFGPUMJ/HNs9Sd2oBo4CEpxrUGNeioz/tldSrD146fhsSTyZmserVkCyXPJbcdyyNcLZvBRYEEAK6zjXznM5tpLznDw1/xjBdSmDZ86nUWBtNDrOzsKfV+2sr1qrvnhdzWeqbQJOb4hgaE2uNx0eGFyFX1KE90ieL/DeJJWAw3KPYP7tDr7e3KFHN4CeRXiYvlsepPps9owlCyH0c83bndANN5v23Y4vlPb3VeTfaCG0o8xo93ctWZs3QvBeNj8veqDpZZeCBA8fVBlfUTLUNYZjg1JnfW6CrR2B6yrJbHyXN/7+qTiUkv6jjvxF7H4JCS8NC5zwOsMWN7ICcPS7Q== 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=cLuFN7ETSMdsDML8QA4HWFOetfg3FG/JhWZcJn/kG8g=; b=Y3lwqbkK52cBKq76oojh5qCFcNt5vPnDfS7vqP5POe5Qj6SmVFRdERcmWEo8dJK6ZO83y+oZWOz2qsXsLQER1ySw8jzjgmaOrj5ssIK0C+8y7l6T4+DL/dNQ3uUU7XNbHk1edy6CEqM053qSZ3V9zQ7hHu7SBgW1pxwMAlwyAJIcaiJDAxU4OvHZ10R/iJzI5wfBUz/YzAs67Coo1PFiUAs20NrN46ejOTV52K2H5En/0/6BWC27GtqL4dMwhRomOpB/30eUeBeeHVa7LfiT7Z/kLQDEmKr72ADo3FoXevxJfwm3dZwDueiUPa72h16eX7NeusnGWXjUUDFx7Dl/XQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0166.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:375::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.17; Fri, 9 Aug 2024 23:52:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%3]) with mapi id 15.20.7828.023; Fri, 9 Aug 2024 23:52:38 +0000 Message-ID: Date: Sat, 10 Aug 2024 01:52:36 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240716171155.31838-1-anton@khirnov.net> <20240716171155.31838-37-anton@khirnov.net> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240716171155.31838-37-anton@khirnov.net> X-TMN: [CNv7lLV7D7u6O+w0qVDCPA7filAM3B1MdH/NEtGdVcc=] X-ClientProxiedBy: ZR2P278CA0001.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::9) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <58cad179-13cb-4462-9fd8-5d9d8e397805@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0166:EE_ X-MS-Office365-Filtering-Correlation-Id: 28576a41-8c03-4ca6-605e-08dcb8ce5961 X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|461199028|15080799003|5072599009|19110799003|440099028|3412199025; X-Microsoft-Antispam-Message-Info: 2XFfTpOQeKyFLzvp/Yl09obKicjSJpw82puhvNZ60t85Z/5VYo6O48cDVE+ElolLLTHt47jx3Kr6i15pfrQbpLmaVYftGtzlPiIOoJdA25p6jP1WorustfflrHrPis7a/M4AXvpf+K6o+y133eZd2/NQFwblMV50R0xV/6Zl8r52zY+R+iiwLW4oQSzdSU3QOsirzrVO9WLqe6pDSJNiCKlZGZI+8+D2G7pZOHTiHkH0qOLqsKdvqQiChnRqHY5raqmZcpxMo+iiTNeZfSCRoBZcKeLr0JvlORfE4YRIH2cErR5qXr+m42UriwyxjoeIFAnnWDG0reiIlltpQP6vE/BuPL3Bdk/kZy0iXUUjW4sgtzFkpylwQ/s1Y7IP8WO/VP0ItGWl/MjNZY/h2js6SUNvwhQaJXXPePgjhRR+zmFVPy0UBpYe0Y/w1JCAM3cWTeUVWsxovbNnaUAZdfXbnsLXGglVlc+pd9c4NYYl79XdgYz3KjcGWCK24gXpb7zt0B4ZGNqNZUGUOC2DJMberCc2v1snIqRL1dP/NpV80g/YiFSCpp/dsQmCFUk2up1FglMLqHXeLEkivhq1hVp67dbYMq4Y9ZONXn8F6HmoB6nDYXOKBiJq78EUVnSmxAuEcKl+x9KMWAdyFWZl6Ly/SyZwqBTDL5vKDrHrmYHr6286obzxYVUuTw0elhatFQTqflW345YActK94htpHhIxug== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?czRzUmZ6YVlRbkk4RWRLN0FmZ0F6elFKKzdId3Z2aCs4M3YzM2dqcDBnVkE2?= =?utf-8?B?b1ZkSUIrVk9VcmFZYy9oUDV3YzRLSXZCcS9jOWFLSHc0NnlXT2xNN21paG1Y?= =?utf-8?B?bmR0MlhLOFNMK0V0RkErSWkyMHdSTVBERTZjRERrZG9CYnMzbXF1NHZ3b2Vs?= =?utf-8?B?dUNicXRnQjRTWWFXZklsSXdkVWUybkxWVzFzdlI2NkYrdiszL1NsSDRrYU1r?= =?utf-8?B?MmUwOWg4dnAxMm9jYzdMd0VsTWtSSWc1TnhyenFUMlNXVHVPZGZPNnU0cC8z?= =?utf-8?B?TmdMakFoSStoSSs3bTVLamkxNFdyU0NEQmM3akVqRHNTL3ZlRHpLc3FoSkVt?= =?utf-8?B?YldDR0lpZzZqdHMzdm5wQ0cxclFkZDBlNDFYM3RNd0pobk0vV0IrYTZhd1pP?= =?utf-8?B?VnBOdXZJdVlPOGh0VlNWZXYydzNhYW01YWpHMzE3NVZ2NHNpdExSTUZHNHpX?= =?utf-8?B?b3h3YldqVDJwclRqNExoMEl4aElvM1ZsdWtWSm1RbGNCVmZLRnU2c0lSTFo2?= =?utf-8?B?Qms2eGhtTE1GRzB0OWJUb1NTWTJNWml0K0Vzbm5VU0RIREQxLzBpSTBhQSs4?= =?utf-8?B?YnNBeURhc2c1Q0lYVHhUa0t2bXZXdUF6VnBOM1NlQ2lKZENRbkdKdWR0SWIz?= =?utf-8?B?NUZhdURxY1lSYWhtK09DaEM4a2lDTHBMZncwS2VHSW1Bd3NHVnJRdGZNK0ZU?= =?utf-8?B?OUZBTlR6cDIrR0x6a3NIK21oZ1FqcStxamY4aVpLYUJid3VpRFNMTXpLaEpS?= =?utf-8?B?Z2FYS3A4a0NiT1M0RFNKV1BKK1lSckwyUyt3Nnc1T0QyenhpWmJnUnBxbXRi?= =?utf-8?B?bGR5T2xKMWl3YnNYcVU2K2dGZk5tY1ZQZ05Ham1lL2FMSzRNTUJjVkFFTjdw?= =?utf-8?B?ZzRLQk84SWdBazNrbVB5b2h3bm94N0NJMW1KZmtHR0Nsc3Y3NmNFS1NPRGNJ?= =?utf-8?B?bUZMOS85ZmU4QUlZL0JBRDZZK0lnbzd6MjJVM1ZjaXVKdmQyL1pvNDVCdlZZ?= =?utf-8?B?SE80MWtDZXJKZk95U3ZoelYxTmUyRzBSc3FPajhnLzZ3S2lHL2RZVXRYMGdl?= =?utf-8?B?R3lSczMzVjdnYWphcFRIVzV4Mmd3U1NnazBrMUJrMGJkRG5LbmczMEtNVXJx?= =?utf-8?B?dUZIcG5YVCtrenF4UURaM3F3TEZObW9pczQvRFJpU3pqY2lINCtqNFdaSmpD?= =?utf-8?B?SUlJMC9zTVk5RjNRK1VuU2sraVp1aGJpaS83UEIwSTREUk5mWVlscE9MaFh2?= =?utf-8?B?Sjh3emFNVnFwajA1QW1hNEs2WUNzcFhlTmZXTGlUdXhDbS9mdzFyakM0Y1hl?= =?utf-8?B?TWdzUFFCQXB0SktxWG1zR1hFeExkamhRbmZaUDVWaGRldjBGcVExYlBPTU5y?= =?utf-8?B?UlpidFIyazlYTVZvKytQcU5TY0hJUTdIRlFKNTEvNVRKMU8yU2t5Si9KTjFU?= =?utf-8?B?dTJWYUswTEozbkFRSElrUnRaTjcrYzNwNkFEaUtickVWRFlBYmR1NzM4V0R1?= =?utf-8?B?L3BtQ0ltQlprU1R1TTUwQjRNNU13aVdnbjNpbVkzYkZBdzQzZzVpbFk0Nm9W?= =?utf-8?B?QXUwTXRQTEU0N2Y2ZFowdlVnaTBSQ05iTER2RUtaRzkzMzlmMGEvK0RyM2Nq?= =?utf-8?B?MmgzTFFUelMvOHY1c0pHN3lndnZlM3I4WCtFd0xIYlBsUGxOMGVESU1jV3pG?= =?utf-8?B?SWZUZjFWdGZmSjNyYnk1bitIV0p5aGxUNHlialAvTllRUFR1UVZrVm13PT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 28576a41-8c03-4ca6-605e-08dcb8ce5961 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2024 23:52:38.5188 (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: AS8P250MB0166 Subject: Re: [FFmpeg-devel] [PATCH 37/39] lavc/hevcdec: use a ContainerFifo to hold frames scheduled for output 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: Anton Khirnov: > Instead of a single AVFrame. > > Will be useful in future commits, where we will want to produce multiple > output frames for a single coded frame. > --- > libavcodec/Makefile | 2 +- > libavcodec/hevc/hevcdec.c | 30 ++++++++++++++++++++---------- > libavcodec/hevc/hevcdec.h | 5 +++-- > libavcodec/hevc/refs.c | 11 +++-------- > 4 files changed, 27 insertions(+), 21 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 771e2b597e..e67b729bd3 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -431,7 +431,7 @@ OBJS-$(CONFIG_HCA_DECODER) += hcadec.o > OBJS-$(CONFIG_HCOM_DECODER) += hcom.o > OBJS-$(CONFIG_HDR_DECODER) += hdrdec.o > OBJS-$(CONFIG_HDR_ENCODER) += hdrenc.o > -OBJS-$(CONFIG_HEVC_DECODER) += aom_film_grain.o h274.o > +OBJS-$(CONFIG_HEVC_DECODER) += aom_film_grain.o h274.o container_fifo.o > OBJS-$(CONFIG_HEVC_AMF_ENCODER) += amfenc_hevc.o > OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o > OBJS-$(CONFIG_HEVC_D3D12VA_ENCODER) += d3d12va_encode_hevc.o h265_profile_level.o \ > diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c > index fc87169a1a..5e28bfe54e 100644 > --- a/libavcodec/hevc/hevcdec.c > +++ b/libavcodec/hevc/hevcdec.c > @@ -3006,6 +3006,10 @@ static int hevc_frame_start(HEVCContext *s) > s->cur_frame->frame_grain->height = s->cur_frame->f->height; > if ((ret = ff_thread_get_buffer(s->avctx, s->cur_frame->frame_grain, 0)) < 0) > goto fail; > + > + ret = av_frame_copy_props(s->cur_frame->frame_grain, s->cur_frame->f); > + if (ret < 0) > + goto fail; > } > > s->cur_frame->f->pict_type = 3 - s->sh.slice_type; > @@ -3013,8 +3017,7 @@ static int hevc_frame_start(HEVCContext *s) > if (!IS_IRAP(s)) > ff_hevc_bump_frame(s); > > - av_frame_unref(s->output_frame); > - ret = ff_hevc_output_frame(s, s->output_frame, 0); > + ret = ff_hevc_output_frame(s, 0); > if (ret < 0) > goto fail; > > @@ -3411,13 +3414,16 @@ static int hevc_receive_frame(AVCodecContext *avctx, AVFrame *frame) > uint8_t *sd; > size_t sd_size; > > + if (ff_container_fifo_can_read(s->output_fifo)) > + goto do_output; > + > av_packet_unref(avpkt); > ret = ff_decode_get_packet(avctx, avpkt); > if (ret == AVERROR_EOF) { > - ret = ff_hevc_output_frame(s, frame, 1); > + ret = ff_hevc_output_frame(s, 1); > if (ret < 0) > return ret; > - return (ret > 0) ? 0 : AVERROR_EOF; > + goto do_output; > } else if (ret < 0) > return ret; > > @@ -3442,12 +3448,15 @@ static int hevc_receive_frame(AVCodecContext *avctx, AVFrame *frame) > if (ret < 0) > return ret; > > - if (s->output_frame->buf[0]) { > - av_frame_move_ref(frame, s->output_frame); > +do_output: > + if (ff_container_fifo_read(s->output_fifo, frame) >= 0) { This looks like it adds a (several) av_frame_move_ref() for the common case in which we only have one output frame. Can't this be avoided? > + if (!(avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) > + av_frame_remove_side_data(frame, AV_FRAME_DATA_FILM_GRAIN_PARAMS); > + > return 0; > } > > - return AVERROR(EAGAIN); > + return avci->draining ? AVERROR_EOF : AVERROR(EAGAIN); > } > > static int hevc_ref_frame(HEVCFrame *dst, const HEVCFrame *src) > @@ -3499,7 +3508,8 @@ static av_cold int hevc_decode_free(AVCodecContext *avctx) > av_freep(&s->sao_pixel_buffer_h[i]); > av_freep(&s->sao_pixel_buffer_v[i]); > } > - av_frame_free(&s->output_frame); > + > + ff_container_fifo_free(&s->output_fifo); > > for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { > ff_hevc_unref_frame(&s->DPB[i], ~0); > @@ -3537,8 +3547,8 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) > s->local_ctx[0].logctx = avctx; > s->local_ctx[0].common_cabac_state = &s->cabac; > > - s->output_frame = av_frame_alloc(); > - if (!s->output_frame) > + s->output_fifo = ff_container_fifo_alloc_avframe(0); > + if (!s->output_fifo) > return AVERROR(ENOMEM); > > for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { > diff --git a/libavcodec/hevc/hevcdec.h b/libavcodec/hevc/hevcdec.h > index da4d83e661..f2705b8de2 100644 > --- a/libavcodec/hevc/hevcdec.h > +++ b/libavcodec/hevc/hevcdec.h > @@ -31,6 +31,7 @@ > #include "libavcodec/avcodec.h" > #include "libavcodec/bswapdsp.h" > #include "libavcodec/cabac.h" > +#include "libavcodec/container_fifo.h" Unnecessary. Just use struct ContainerFifo* below. > #include "libavcodec/dovi_rpu.h" > #include "libavcodec/get_bits.h" > #include "libavcodec/h2645_parse.h" > @@ -457,7 +458,7 @@ typedef struct HEVCContext { > /** 1 if the independent slice segment header was successfully parsed */ > uint8_t slice_initialized; > > - AVFrame *output_frame; > + ContainerFifo *output_fifo; > uint8_t *sao_pixel_buffer_h[3]; > uint8_t *sao_pixel_buffer_v[3]; > > @@ -636,7 +637,7 @@ static av_always_inline int ff_hevc_nal_is_nonref(enum HEVCNALUnitType type) > * Find next frame in output order and put a reference to it in frame. > * @return 1 if a frame was output, 0 otherwise > */ > -int ff_hevc_output_frame(HEVCContext *s, AVFrame *frame, int flush); > +int ff_hevc_output_frame(HEVCContext *s, int flush); > > void ff_hevc_bump_frame(HEVCContext *s); > > diff --git a/libavcodec/hevc/refs.c b/libavcodec/hevc/refs.c > index 48fc4d27da..44ee7c837a 100644 > --- a/libavcodec/hevc/refs.c > +++ b/libavcodec/hevc/refs.c > @@ -171,7 +171,7 @@ static void unref_missing_refs(HEVCContext *s) > } > } > > -int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) > +int ff_hevc_output_frame(HEVCContext *s, int flush) > { > if (IS_IRAP(s) && s->no_rasl_output_flag == 1) { > const static int mask = HEVC_FRAME_FLAG_BUMPING | HEVC_FRAME_FLAG_OUTPUT; > @@ -211,7 +211,8 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) > if (nb_output) { > HEVCFrame *frame = &s->DPB[min_idx]; > > - ret = av_frame_ref(out, frame->needs_fg ? frame->frame_grain : frame->f); > + ret = ff_container_fifo_write(s->output_fifo, > + frame->needs_fg ? frame->frame_grain : frame->f); > if (frame->flags & HEVC_FRAME_FLAG_BUMPING) > ff_hevc_unref_frame(frame, HEVC_FRAME_FLAG_OUTPUT | HEVC_FRAME_FLAG_BUMPING); > else > @@ -219,12 +220,6 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) > if (ret < 0) > return ret; > > - if (frame->needs_fg && (ret = av_frame_copy_props(out, frame->f)) < 0) > - return ret; > - > - if (!(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN)) > - av_frame_remove_side_data(out, AV_FRAME_DATA_FILM_GRAIN_PARAMS); > - > av_log(s->avctx, AV_LOG_DEBUG, > "Output frame with POC %d.\n", frame->poc); > return 1; _______________________________________________ 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".