From patchwork Tue Aug 1 13:30:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 43056 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c89:b0:130:ccc6:6c4b with SMTP id fq9csp412252pzb; Tue, 1 Aug 2023 06:31:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlFn7+U0a7TneaywqfI8uQVzUNJZ6i00MIRhM7aOurLppcRUMorbXBjItFN9UzrZvtsRMuJb X-Received: by 2002:a2e:87d5:0:b0:2b4:70e2:3be7 with SMTP id v21-20020a2e87d5000000b002b470e23be7mr2478290ljj.11.1690896694382; Tue, 01 Aug 2023 06:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690896694; cv=none; d=google.com; s=arc-20160816; b=Jgxj75JIu6xFc738ZODZX2lMcvC90fcaQ0539xEoWWjvoMH4fTJBQgSCCPLw3D17z6 Dz8T9zU7EqN6ehGo0ZH4WDg0DL1ZXKGNdtwRWYtfwAhY/sBEs6t7+SXQ3kwMyITF6WRb 0NUouXZMIWhHasQoWiBEqSRy99pb/ZI7DO53AkReTarmpodd8wwSGNQtoQKtr5c/uR7e XeBQR8v9d47tQtUKTfC1OYPVw+PVKqHz6JM0t3rlZDxq6+kPnheWuqLbMT340uCgxAiY X2QKQqj2suOUDL3giMtlyN4FCipg5Pw4cKF+vojwhCiwxJIYWcmQvhNzyiAobpbPhZkM QvcA== 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=UiRAIwN9G7gIvyPAxbxSuUJAstOkWGcmUm+npZO6U8DmYU//3zGRdXImqOXKanagpp DrhMFxYAvWcz15lPVqA65EuNrT370DBfV6/Ea57Cus7AVk+mepIAikpMIauEnBmjQkO+ 5euI64MWmoZBPj8pYEXRh/ivq96JX8ZmIEh3Q1GeSywHC5ENVR620bpq4Y93sSfYqn+I fwIXjOM2upNwMXbZHkA5r0ZrQt8LP23WGM2aLIcRkQRryOjk+fT2U3waVBzOP1DtxiXF 3Cymrm9hzNxd4laA/ZB6bBSfvA7pFvRdvh8KU0UC03S/POAxUeTOSYw6UzQVZDI+6ynd u7ZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=lzugMTsB; 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 r19-20020a170906351300b009934b1eb56dsi8564173eja.11.2023.08.01.06.31.33; Tue, 01 Aug 2023 06:31:34 -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=lzugMTsB; 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 0350D68C196; Tue, 1 Aug 2023 16:31:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A6C268C402 for ; Tue, 1 Aug 2023 16:31:00 +0300 (EEST) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-583ad8ab0faso5183147b3.0 for ; Tue, 01 Aug 2023 06:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690896658; x=1691501458; 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=lzugMTsBKDeMGo0SBVAFDP4NkIZ7pKQpbARNLcyP6/to2IoStXa8FcCUt2nTcU/xXm 3KNs1D6oK93gisRSj7hYRQaKzEj3vX0DGJdnf2e7LfUzRHo8ZbWqlQZNXp9dKJq3Di3p dYIBatdxpJISMTSib0/nV2VrzLb7fTlYc4aJGYIQvh5drUa9Rcy22CTxGva9Z+p1RxJd 4bMu4cAKLZco6yHL6lmn0UDjAf8ZeqOkQb5QO5EyfjNk62ngXwjzm+IUNK2dlcO3atnL EvF1X0bK+wERVpmbrJNGg3BtjwJ0Bas0euZnBegyNjQpL4aRWx1aRanbnXMUFHqYuceT J4Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690896658; x=1691501458; 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=SYKvUJL7dJ7Ni/Cp4UhKt1e+MoCYTEF+v2H+w+AfCM42tMeCzPoN6X/aeCnr8I1ymd mlZvIaT2sHnLZyi4TIy6FaI22yjzOGSWI8bC4ue9rrgbyT38V04EW+0FcKz6TmXrSpAJ NhLRJQFGKLWR8NMtK1b7nt0mbMfXPZqjg5vn3bUH2hjYmHWPhNrUWn3FaCOWCUa4Kln4 M4dw2ktaWDAuMm/zrMa2NM+WEnFqXKxYw9StzL3SC/EITdLdy5/X1oB2TjK3Jepndtfp iQ5B6U0g4RNYfsQSjFlHvJPJLha9pY4HfI4edqb8HdZtZ+pkGTKlSKVte5JeJZrNSZrB 2l4g== X-Gm-Message-State: ABy/qLYjbD8DyqTcnd+QhSwSouv5xldCWr1I4h1Ag9C13VCJGOrqbQz+ kFV5QX+q9oNHSg8hK5/HGOC8sy9JqzM= X-Received: by 2002:a81:6dd8:0:b0:567:7dc3:2618 with SMTP id i207-20020a816dd8000000b005677dc32618mr4679227ywc.1.1690896658524; Tue, 01 Aug 2023 06:30:58 -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 x84-20020a0dd557000000b005463e45458bsm3738130ywd.123.2023.08.01.06.30.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Aug 2023 06:30:58 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 09:30:52 -0400 Message-ID: <20230801133055.256537-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230801133055.256537-1-leo.izen@gmail.com> References: <20230801133055.256537-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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: rfKBSTFGi3SB 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; }