From patchwork Wed Aug 2 20:33:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 43098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp896189pzb; Wed, 2 Aug 2023 13:34:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlH34M+8LLP31RBg9b6Dgn43FzG/GX/EEqD4LEph+Kaktai8V1CcoOwAsQoyr/I+Vz4uGjQ3 X-Received: by 2002:aa7:cfc8:0:b0:522:4964:d590 with SMTP id r8-20020aa7cfc8000000b005224964d590mr5906558edy.10.1691008451007; Wed, 02 Aug 2023 13:34:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691008450; cv=none; d=google.com; s=arc-20160816; b=f1j5Oaz8k9+vuffD0VKhcZL3JYcW73rYikOq2aM8DGhGdhqKW4y9UvrzFgrHga6egM hWyUQ8DgnOymPwmolDCukfukhwTsm25u1Iry9cjsbAsVdZVh6AH01JmAQwltUxYcTHvd vsYIGrBJgxWUF47wjCcwzeI/AUq6168gwIeRSjtycZOcwLOsewoUUURI65YoVbYvYpEu mu0czG4PIps43FNS7SeQeRSBImkmCPo5HrbU8WJAUDFCaMynkBi5w0W9XIz7xw0ZEhJm AQgRfeYDCvtJyLgA3DpbWDN0T9tzfhH74jQZZGi0RcHixbGwf245CfkcpcVI4qFuvkGN ZMgA== 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 :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ziyw83vsCJx6wdE/lB9KXgJiUGUHWMoiUeiH4z5IiPc=; fh=W57KVLPaTz0tbsYsrKIbKYuBNANpg4Tl/mHbnGjtYGU=; b=FH5KPYU+Pb9ii/7rSxLvpHIi4MsXdlW/kfrYpTG8QwltNYzVgKX9/Pz4Xmc59EqqPd kXUfeSDzN/P1qTjQdVzt8WN9oA++dCtPueKu5rZWiqzZ620oUFyK8Ls2RFdj4GjtvSN/ 3L6lm1u1hKs8SWcDFHJYCZ538RCN0l3Fp/oFCKG8ERYXR8tA2I8/iHPMA+Cd6royzdxW pXyRPGb8tloET7aEoP3JQaEuZrdwNz7hLjT7kijz71qKxLSVF+NAsmiFDWXixzJSKLf0 vwKHqMw2KXumCZxZ94z8aGW6ldbkUhmVA4BKdvJvbRJJ14H+2YqVGQ2bUvqMzuC1ni/7 9DQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=O0wq8ELc; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w9-20020aa7cb49000000b0051e242852fasi10456223edt.584.2023.08.02.13.34.10; Wed, 02 Aug 2023 13:34:10 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=O0wq8ELc; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 610F768C669; Wed, 2 Aug 2023 23:33:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94B6D68C679 for ; Wed, 2 Aug 2023 23:33:41 +0300 (EEST) Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3a3ee866e00so35270b6e.0 for ; Wed, 02 Aug 2023 13:33:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691008419; x=1691613219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cliAQNtcCNgd2jw9mhB9AXrbY1Z+g9xOZ8lWWWvZYG4=; b=O0wq8ELcFfk/NT+mHopdy275M9SzCe4ryoIWVu0km7HDb/Ed5ehkL3WcSS41iU4usH Rrv089Cfpg10y2j8y/s1dz43823VNWG+FpesKf6VL+4rYrjXziBpw4MQM+BZY+hzire6 e66uMiV1ch4QoqB1HR0G2wA1rmiMSVYcfNq3qskb9s6RXq0DjlL8Qxa4Lmmi4+j2VjNP uySThBy94Kh65R15Qay3+MnXXQSe+W2gF0o864ONhPCYNDSIZVCJk4LXBmcwJpuipNyX 8NY46qVOyoD6L8eepYNtsCX185whg0uXY8TnKENmyfPbDxSpXWQtRSD45/1y8htDL1Sn XjhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691008419; x=1691613219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cliAQNtcCNgd2jw9mhB9AXrbY1Z+g9xOZ8lWWWvZYG4=; b=Lvt8VTRX6wrWV+RqIcF83VpcZvkojf8ThrFUqD8uDq0QmfSiFThzkLo9nvf9X65yPz TX9yVllGghtpkv8e3eaqO9pvcdKzC9zUU+eyRbsPKY4CK2cJUZvvcY6AVFmKAVM343h3 Z6JBXcIsN8xxMSJsw2BkUAf/E+p+aomtKJeyl+MdtNfhP12iXIta7Og6TIWsqiZlEKDn PSRac5oqC9gbhgbqiAEQtsTpy2NmqC4kzJna9WML4jVVz8jqdr02KwOhdv032qGLZroJ bpGaPic1UhaI3d8nmygQTW7wSjHPzpLaUA9AJmD0F5bK/QHb3HSCWTIJw2m5/X3Clu5N IRFA== X-Gm-Message-State: ABy/qLaGNd5hY7XpLiQvUGogYfRvM25iWWM/zpo3MV6MMyCLIN2fGryw TUgg2rLIHiEWgn4Wjra7HsqX8zhVGPk= X-Received: by 2002:a05:6808:1893:b0:3a7:49b9:20c with SMTP id bi19-20020a056808189300b003a749b9020cmr6843042oib.0.1691008419381; Wed, 02 Aug 2023 13:33:39 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id cf4-20020a056902180400b00c654cc439fesm3930524ybb.52.2023.08.02.13.33.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 13:33:39 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 16:33:31 -0400 Message-ID: <20230802203334.23640-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230802203334.23640-1-leo.izen@gmail.com> References: <20230802203334.23640-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 2/5] avcodec/libjxldec: use internal AVFrame as buffered space 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 Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fd8PtYbKvAMS Before this commit, the decoder erroneously assumes that the AVFrame passed to the receive_frame is the same one each time. Now it keeps an internal AVFrame to write into, and copies it over when it's done. Signed-off-by: Leo Izen --- libavcodec/libjxldec.c | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c index 9be1d9295a..002740d9c1 100644 --- a/libavcodec/libjxldec.c +++ b/libavcodec/libjxldec.c @@ -58,6 +58,7 @@ typedef struct LibJxlDecodeContext { int64_t frame_duration; int prev_is_last; AVRational timebase; + AVFrame *frame; } LibJxlDecodeContext; static int libjxl_init_jxl_decoder(AVCodecContext *avctx) @@ -104,6 +105,9 @@ static av_cold int libjxl_decode_init(AVCodecContext *avctx) ctx->avpkt = avctx->internal->in_pkt; ctx->pts = 0; + ctx->frame = av_frame_alloc(); + if (!ctx->frame) + return AVERROR(ENOMEM); return libjxl_init_jxl_decoder(avctx); } @@ -406,10 +410,6 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) return AVERROR_INVALIDDATA; case JXL_DEC_NEED_MORE_INPUT: av_log(avctx, AV_LOG_DEBUG, "NEED_MORE_INPUT event emitted\n"); - if (!pkt->size) { - av_packet_unref(pkt); - return AVERROR(EAGAIN); - } continue; case JXL_DEC_BASIC_INFO: av_log(avctx, AV_LOG_DEBUG, "BASIC_INFO event emitted\n"); @@ -438,16 +438,19 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) continue; case JXL_DEC_COLOR_ENCODING: av_log(avctx, AV_LOG_DEBUG, "COLOR_ENCODING event emitted\n"); - if ((ret = libjxl_color_encoding_event(avctx, frame)) < 0) + ret = libjxl_color_encoding_event(avctx, ctx->frame); + if (ret < 0) return ret; continue; case JXL_DEC_NEED_IMAGE_OUT_BUFFER: av_log(avctx, AV_LOG_DEBUG, "NEED_IMAGE_OUT_BUFFER event emitted\n"); - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + ret = ff_get_buffer(avctx, ctx->frame, 0); + if (ret < 0) return ret; - ctx->jxl_pixfmt.align = frame->linesize[0]; - if (JxlDecoderSetImageOutBuffer(ctx->decoder, &ctx->jxl_pixfmt, frame->data[0], frame->buf[0]->size) - != JXL_DEC_SUCCESS) { + ctx->jxl_pixfmt.align = ctx->frame->linesize[0]; + if (JxlDecoderSetImageOutBuffer(ctx->decoder, &ctx->jxl_pixfmt, + ctx->frame->data[0], ctx->frame->buf[0]->size) + != JXL_DEC_SUCCESS) { av_log(avctx, AV_LOG_ERROR, "Bad libjxl dec need image out buffer event\n"); return AVERROR_EXTERNAL; } @@ -461,8 +464,8 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) case JXL_DEC_FRAME: av_log(avctx, AV_LOG_DEBUG, "FRAME event emitted\n"); if (!ctx->basic_info.have_animation || ctx->prev_is_last) { - frame->pict_type = AV_PICTURE_TYPE_I; - frame->flags |= AV_FRAME_FLAG_KEY; + ctx->frame->pict_type = AV_PICTURE_TYPE_I; + ctx->frame->flags |= AV_FRAME_FLAG_KEY; } if (ctx->basic_info.have_animation) { JxlFrameHeader header; @@ -481,20 +484,21 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) /* full image is one frame, even if animated */ av_log(avctx, AV_LOG_DEBUG, "FULL_IMAGE event emitted\n"); if (ctx->iccp) { - AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp); + AVFrameSideData *sd = av_frame_new_side_data_from_buf(ctx->frame, AV_FRAME_DATA_ICC_PROFILE, ctx->iccp); if (!sd) return AVERROR(ENOMEM); /* ownership is transfered, and it is not ref-ed */ ctx->iccp = NULL; } if (avctx->pkt_timebase.num) { - frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase); - frame->duration = av_rescale_q(ctx->frame_duration, ctx->timebase, avctx->pkt_timebase); + ctx->frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase); + ctx->frame->duration = av_rescale_q(ctx->frame_duration, ctx->timebase, avctx->pkt_timebase); } else { - frame->pts = ctx->pts; - frame->duration = ctx->frame_duration; + ctx->frame->pts = ctx->pts; + ctx->frame->duration = ctx->frame_duration; } ctx->pts += ctx->frame_duration; + av_frame_move_ref(frame, ctx->frame); return 0; case JXL_DEC_SUCCESS: av_log(avctx, AV_LOG_DEBUG, "SUCCESS event emitted\n"); @@ -525,6 +529,7 @@ static av_cold int libjxl_decode_close(AVCodecContext *avctx) JxlDecoderDestroy(ctx->decoder); ctx->decoder = NULL; av_buffer_unref(&ctx->iccp); + av_frame_free(&ctx->frame); return 0; }