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 3AF014BD58 for ; Tue, 16 Jul 2024 18:16:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0129A68DB4E; Tue, 16 Jul 2024 21:14:25 +0300 (EEST) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F17B68DA9D for ; Tue, 16 Jul 2024 21:14:04 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=jTK7oO0n; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id D4E9F4E23 for ; Tue, 16 Jul 2024 19:24:20 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 4nKgPWEy20MG for ; Tue, 16 Jul 2024 19:24:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1721150659; bh=Xj7luEe9E98aNRUFOLzKpUf+TgK8cTEi00xih3LNp/E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jTK7oO0nmz5es+TNb3AFFI//3yn0bu4RgtkWct36Sg6ppuXcaNl5LdfZaIDs6xms2 KulwssprFSVoVZPmL5DiFg3h5pjuLIeY47SeZAzcYrUbFY/yGbNB1dCvoTn3VzpiGR Wb+gvdpbk+OPUqZAmKI/zQcksbn/DXzXwnhKST1gPwyg59GdqyVTl0ul1dM0eT5w+v BSSjkNyZg5bAVP04upak/x1hchyiYNn0vjp1PbJtuwlNL3pPWY9ofcszx3Egh2btcx HS7N5UD2LLSsX2UAuVcb73+fLp1pVQF3cc2l1jAZ1AS6ZLRs0s6yiAU4MDB5YAix5B NJfDjtR6mk+fQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 345204DF2 for ; Tue, 16 Jul 2024 19:24:19 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E21F83A33D9 for ; Tue, 16 Jul 2024 19:16:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 19:11:52 +0200 Message-ID: <20240716171155.31838-37-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240716171155.31838-1-anton@khirnov.net> References: <20240716171155.31838-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [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: 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) { + 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" #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; -- 2.43.0 _______________________________________________ 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".