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 658AD45B3E for ; Fri, 17 Mar 2023 18:59:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6679C68C24B; Fri, 17 Mar 2023 20:59:55 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 15B7E68C155 for ; Fri, 17 Mar 2023 20:59:49 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0075B2404EA; Fri, 17 Mar 2023 19:59:47 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id I41qnl1uDV8o; Fri, 17 Mar 2023 19:59:46 +0100 (CET) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (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 "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 60149240178; Fri, 17 Mar 2023 19:59:46 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id 467141601B2; Fri, 17 Mar 2023 19:59:46 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <20230303203146.377726-2-leo.izen@gmail.com> References: <20230303203146.377726-1-leo.izen@gmail.com> <20230303203146.377726-2-leo.izen@gmail.com> Mail-Followup-To: FFmpeg development discussions and patches , Leo Izen Date: Fri, 17 Mar 2023 19:59:46 +0100 Message-ID: <167907958625.27013.6461878355465094890@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/libjxldec: add animated decode support 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 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: Quoting Leo Izen (2023-03-03 21:31:45) > -static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_frame, AVPacket *avpkt) > +static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) > { > LibJxlDecodeContext *ctx = avctx->priv_data; > - const uint8_t *buf = avpkt->data; > - size_t remaining = avpkt->size; > JxlDecoderStatus jret; > int ret; > - *got_frame = 0; > + AVPacket *pkt = ctx->avpkt; > + > + if (!pkt->size) { Shouldn't this live inside the loop? It won't happen currently, but in principle ff_decode_get_packet() could return more than one packet. > + av_packet_unref(pkt); > + ret = ff_decode_get_packet(avctx, pkt); > + if (ret < 0 && ret != AVERROR_EOF) > + return ret; > + ctx->remaining = pkt->size; > + if (!pkt->size) { > + /* empty packet means eof */ > + if (ret >= 0) { > + av_packet_unref(pkt); > + return AVERROR(EAGAIN); pkt->size == 0 && ret >= 0 should not happen > + } else { > + return AVERROR_EOF; > + } > + } > + } > > while (1) { > > - jret = JxlDecoderSetInput(ctx->decoder, buf, remaining); > + jret = JxlDecoderSetInput(ctx->decoder, pkt->data + (pkt->size - ctx->remaining), ctx->remaining); Wouldn't it be simpler to offset pkt->data and decremented pkt->size? Then you shouldn't need ctx->remaining at all. > @@ -419,25 +471,23 @@ static int libjxl_decode_frame(AVCodecContext *avctx, AVFrame *frame, int *got_f > /* ownership is transfered, and it is not ref-ed */ > ctx->iccp = NULL; > } > - *got_frame = 1; > - return avpkt->size - remaining; > + frame->pts = av_rescale_q(ctx->pts, ctx->timebase, avctx->pkt_timebase); I think pkt_timebase does not have to be set. Also, you should set frame->duration. -- Anton Khirnov _______________________________________________ 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".