From patchwork Mon Dec 11 17:05:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Zsolt_Vad=C3=A1sz?= X-Patchwork-Id: 45067 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp3060686pzf; Mon, 11 Dec 2023 09:05:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaoVNDCFu3TVSKPct9Ds8nIpZDnXYErJK4iI4Q/1ErsYqdkfsB2Kno5PHo6JcPKtiqSLyw X-Received: by 2002:a17:907:c003:b0:a1d:6d:1392 with SMTP id ss3-20020a170907c00300b00a1d006d1392mr5084628ejc.1.1702314345488; Mon, 11 Dec 2023 09:05:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702314345; cv=none; d=google.com; s=arc-20160816; b=mH0MNceK6WQQCjp+8OH8EWK6aMYIa3fPKM99ThBONaCp4yEkstL4/ZyXGk1pOvVJ+1 bZj7rFCSDMcA4mv5BOL9e9iji2V1QrdedDghYeKctbvGSMy5K47ZZEdya89NcS+jws32 OcJHaAxOl/xGwHs7r4kxPP/MlwG7K4IZU+90yDCNE3H77NXRSeDhncNNm+GKWChnp4Hc p6YCWDleEadp8+qP3UVd7+HLqXryxN04KLL0PBUxmDxr3ggJsp8pcj+0wRWH18RfkRxw N+/6Y6i15fCxSb0qAWeoVpwSLm1Vlqg8+HyI4NiZT7D7+6j7RBsNpOmTLtmr7pizLdez cgFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:feedback-id:message-id:to :date:delivered-to; bh=glRI3fXSg0v+GZOLuATkuXbJOlCnAVie0Bg2VU+ZXz4=; fh=lvOXre93Kc+LM49rLl0yJcoSym9484cIB4O1jbJgoXk=; b=lg5gMqDloebY6BMWNAA8zgujlRQcgfV+NxyZOIDr78aFUUFWWc3DpWbWv+KQ+R5Uvl 1qN4IPHTsww0geUv3aZKTocnfY7CEbGc1LdFgS++dedm06N4evSlcQzIbQvLyrHtR2V+ S3YOvLk2tOkKyrTiFRYmKcoKetRLZOCcDa5LNZTZFLt+WJP1BEcaP99tPedGYFaXanA9 p3Zl59MNjg20JS5o92s9xTIcdatuKtxUv6BjZE55rEMakhoL+AeHIaFUwPp1SVnPyna+ +9Rhw05hi3xPlUQnGyXR7Mpw93qBPZlHrwn8y5JmGtsIr20o/p7JWPOKa9oOgdUnmOkV v4gw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id va3-20020a17090711c300b00a1b855d8ca1si3901080ejb.513.2023.12.11.09.05.38; Mon, 11 Dec 2023 09:05:45 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B01168D1B6; Mon, 11 Dec 2023 19:05:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40130.protonmail.ch (mail-40130.protonmail.ch [185.70.40.130]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D20A68D1A6 for ; Mon, 11 Dec 2023 19:05:26 +0200 (EET) Date: Mon, 11 Dec 2023 17:05:19 +0000 To: FFmpeg development discussions and patches Message-ID: Feedback-ID: 28710920:user:proton MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/libjxlenc: Move image initialization code into libjxl_encode_init_image 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: , X-Patchwork-Original-From: =?utf-8?q?Zsolt_Vad=C3=A1sz_via_ffmpeg-devel?= From: =?utf-8?q?Zsolt_Vad=C3=A1sz?= Reply-To: FFmpeg development discussions and patches Cc: =?utf-8?q?Zsolt_Vad=C3=A1sz?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: y3/wkh2apWcc --- libavcodec/libjxlenc.c | 69 +++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 24 deletions(-) diff --git a/libavcodec/libjxlenc.c b/libavcodec/libjxlenc.c index 92a458d51a..6110c42a7c 100644 --- a/libavcodec/libjxlenc.c +++ b/libavcodec/libjxlenc.c @@ -50,6 +50,9 @@ typedef struct LibJxlEncodeContext { JxlEncoder *encoder; JxlEncoderFrameSettings *options; JxlBasicInfo info; + JxlPixelFormat jxl_fmt; + int animated; + int first_frame; int effort; float distance; int modular; @@ -181,6 +184,9 @@ static av_cold int libjxl_encode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } + ctx->animated = 0; + ctx->first_frame = 1; + return 0; } @@ -235,28 +241,19 @@ static int libjxl_populate_primaries(void *avctx, JxlColorEncoding *jxl_color, e return 0; } -/** - * Encode an entire frame. Currently animation, is not supported by - * this encoder, so this will always reinitialize a new still image - * and encode a one-frame image (for image2 and image2pipe). - */ -static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) +static int libjxl_encode_init_image(AVCodecContext *avctx, const AVFrame *frame) { LibJxlEncodeContext *ctx = avctx->priv_data; - AVFrameSideData *sd; - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(frame->format); + int ret; JxlBasicInfo *info = &ctx->info; + JxlPixelFormat *jxl_fmt = &ctx->jxl_fmt; JxlColorEncoding jxl_color; - JxlPixelFormat jxl_fmt; int bits_per_sample; #if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0, 8, 0) JxlBitDepth jxl_bit_depth; #endif - JxlEncoderStatus jret; - int ret; - size_t available = ctx->buffer_size; - size_t bytes_written = 0; - uint8_t *next_out = ctx->buffer; + const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(frame->format); + AVFrameSideData *sd; /* reset the encoder every frame for image2 muxer */ JxlEncoderReset(ctx->encoder); @@ -269,23 +266,23 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra /* populate the basic info settings */ JxlEncoderInitBasicInfo(info); - jxl_fmt.num_channels = pix_desc->nb_components; + jxl_fmt->num_channels = pix_desc->nb_components; info->xsize = frame->width; info->ysize = frame->height; - info->num_extra_channels = (jxl_fmt.num_channels + 1) % 2; - info->num_color_channels = jxl_fmt.num_channels - info->num_extra_channels; - bits_per_sample = av_get_bits_per_pixel(pix_desc) / jxl_fmt.num_channels; + info->num_extra_channels = (jxl_fmt->num_channels + 1) % 2; + info->num_color_channels = jxl_fmt->num_channels - info->num_extra_channels; + bits_per_sample = av_get_bits_per_pixel(pix_desc) / jxl_fmt->num_channels; info->bits_per_sample = avctx->bits_per_raw_sample > 0 && !(pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) ? avctx->bits_per_raw_sample : bits_per_sample; info->alpha_bits = (info->num_extra_channels > 0) * info->bits_per_sample; if (pix_desc->flags & AV_PIX_FMT_FLAG_FLOAT) { info->exponent_bits_per_sample = info->bits_per_sample > 16 ? 8 : 5; info->alpha_exponent_bits = info->alpha_bits ? info->exponent_bits_per_sample : 0; - jxl_fmt.data_type = info->bits_per_sample > 16 ? JXL_TYPE_FLOAT : JXL_TYPE_FLOAT16; + jxl_fmt->data_type = info->bits_per_sample > 16 ? JXL_TYPE_FLOAT : JXL_TYPE_FLOAT16; } else { info->exponent_bits_per_sample = 0; info->alpha_exponent_bits = 0; - jxl_fmt.data_type = info->bits_per_sample <= 8 ? JXL_TYPE_UINT8 : JXL_TYPE_UINT16; + jxl_fmt->data_type = info->bits_per_sample <= 8 ? JXL_TYPE_UINT8 : JXL_TYPE_UINT16; } #if JPEGXL_NUMERIC_VERSION >= JPEGXL_COMPUTE_NUMERIC_VERSION(0, 8, 0) @@ -383,17 +380,41 @@ static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFra av_log(avctx, AV_LOG_WARNING, "Could not increase codestream level\n"); } - jxl_fmt.endianness = JXL_NATIVE_ENDIAN; - jxl_fmt.align = frame->linesize[0]; + jxl_fmt->endianness = JXL_NATIVE_ENDIAN; + jxl_fmt->align = frame->linesize[0]; + + return 0; +} + +/** + * Encode an entire frame. Currently animation, is not supported by + * this encoder, so this will always reinitialize a new still image + * and encode a one-frame image (for image2 and image2pipe). + */ +static int libjxl_encode_frame(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) +{ + LibJxlEncodeContext *ctx = avctx->priv_data; + JxlEncoderStatus jret; + JxlBasicInfo *info = &ctx->info; + JxlPixelFormat *jxl_fmt = &ctx->jxl_fmt; + int ret; + size_t available = ctx->buffer_size; + size_t bytes_written = 0; + uint8_t *next_out = ctx->buffer; + + if(!ctx->animated || ctx->first_frame) { + if((ret = libjxl_encode_init_image(avctx, frame)) < 0) + return ret; + ctx->first_frame = 0; + } - if (JxlEncoderAddImageFrame(ctx->options, &jxl_fmt, frame->data[0], jxl_fmt.align * info->ysize) != JXL_ENC_SUCCESS) { + if (JxlEncoderAddImageFrame(ctx->options, jxl_fmt, frame->data[0], jxl_fmt->align * info->ysize) != JXL_ENC_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Failed to add Image Frame\n"); return AVERROR_EXTERNAL; } /* * Run this after the last frame in the image has been passed. - * TODO support animation */ JxlEncoderCloseInput(ctx->encoder);