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 BDB584693B for ; Tue, 27 Jun 2023 20:07:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD0CB68C357; Tue, 27 Jun 2023 23:07:34 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2028.outbound.protection.outlook.com [40.92.75.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDED868BEDD for ; Tue, 27 Jun 2023 23:07:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hlbYtVqeUEca71g3d/7AnFM/Pz93IX/pNpcixdcHX79CEN4dlv0luZEA+AlFpgZlkkgXbCZF+udSEstkH8/SJinvDSwb+RYQjwWcD7/qxT4YwtI56gcorftF5S3O11tuhR63cjNucpDf9LNXyBaWi6P0bPCWNqwD/w1E6j5k/7gEDufJdDYwb7Wp/zkjo56Z+lplj9Y7A7AIp77TBYkj8/IxYAJcq7y4X46B2I8hKA/66xfjAalFbMRCWWOyLeFjtHV8Q6hDaMkm+v1j5oasTY8wmUoQALwbOcuPwSiJrTy+QEKVMy0IzgV5Xn7qVwkfHrWyDYBQkeinKe1klZaw7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Dqay6rUE70rQrjyoZMlslt8XplqxSBrcvx0EC+/W0lM=; b=VoM84zfry/YorSQ8v/f6Ds5G5zSr3dg2L9ZwKaKPjcDa+pVwsbcrsaPnPqo5o/6bR6AaW/o8xGFRqZlsBxjyErwc5HAxGZWz/IAV2Q7fmCSCE8HG7+7VzaBKF1kzs8mAHv33zjWGLpFxSP4xYdZZ55PXH3PU53szD/rJgKMm/EomVtqpPbk7gP/M5I6E/oHhypLji5hO2Qx2jAKuyNNkxmblV0epT1vmq9ltwpUS9yOtCldFNeSD7b+4qxITnvEA0dCQnTn6W1KvYdS7vs9EEyqlXgV3d83JRSZmfKzvE3M4OomXYDvDTaf+ONfqkyHz34zz4enDbuD4V3Q3WrBG4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Dqay6rUE70rQrjyoZMlslt8XplqxSBrcvx0EC+/W0lM=; b=P2Zf1CATKSzRg9KrrYaPAx90J47KK0DLmWgC39Ge2hykogZ81GnDvPCredXcaBil2o2Ozz+g40YZKmvIx2CLA4/eViUvEDpvSvlGOhQKKvqoSmrMUP9JrbcfAfkW9vxv7bmjt+Zz+hZQ4nXM0OlpSL4pjFm8VdTceAPBwsGF+pdsOoe/f/p0eRUJtyc/AqWlJWefSCgBVVL1t7sS1knax7liZZ4ahiWXJe7vUPi/2GKVrv2803CNOG/dMWyevTC+Uo2A6vYQzra78KkIhA6RqFl/zKon2urwlNwxJ5+PgiSo4PbVV5mP+66IdG/4Gu0YeuyoNXkeVfEAPUroLXagHg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0257.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.21; Tue, 27 Jun 2023 20:07:27 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::a38:e93f:c7e0:f473]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::a38:e93f:c7e0:f473%7]) with mapi id 15.20.6521.026; Tue, 27 Jun 2023 20:07:27 +0000 Message-ID: Date: Tue, 27 Jun 2023 22:08:36 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230626154922.66550-1-leo.izen@gmail.com> <20230626154922.66550-2-leo.izen@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230626154922.66550-2-leo.izen@gmail.com> X-TMN: [JuwtHLOpu4XgOtC5BQ2OteuvhCK8wcu9] X-ClientProxiedBy: FR0P281CA0229.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b2::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <628f7a0e-057f-f298-ab8f-bfbe1b187d91@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0257:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c6a781d-a0d5-4565-d4a4-08db774a2120 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: boPTenb601HEfOUO/hn/PiQOMhiCwHNnEn2MJVxU5+rrqe186oKDPLMdb8U2zMHulYCvdZzbpy/b/F1U1u/Mb7qXsICYVmxJi0ChS+Y7Diy2rpC2yZKRiEMdnPT1Uhgc5BG0atTot1LcP1l23MxAoqIPScXiAIe4LPb8M3VcOxxU+avEwzkQ8QHBGNDN76uzD1QtlWoGFAJ0t7siwtLZAQVlvGntFgA0uUuMkLdc1np3eBcnM4LVhcEVOOsHjPWg8bUrFoqAguOjiS8BD1aAMeL8ih+38X8EZ3uLTMhFpCcyH6jYkOR0W0g/4bYBCx9q7WgZN3ASmg4XAdmy5200DJCuIFBJ2MCmXbeq/G8eoyHDmEAlqY1I+FMtXier1R0uCYZfhLeBJnJ3Qigp1CURKTfGtypy8Kog5+Oc6xyso3xEmmRM1ZWt6/gpEufXOerjw2BMsyEBSd/AC586fRqbGFNWxXSO3Hh48B1yAQPYzpXWnGnQEuMqQgn5t2udBeCj7N+WU8Uy6SuFerP8Du1EsdOsOmZaxas9z0SacYjyJLAZEmvnBY9Tr0DkDdoeCQlG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cExRVXBOUExWdzZPSVE5TDJkUTN6U2QzL0ZOaG42RXlUZkVDQ2FoS0lza29I?= =?utf-8?B?c0Zob1ErNlBFMHlFWm1JUS95eHZtdlJPcVRyUGFZdG9FbVdaUWpCc2lSTlJ2?= =?utf-8?B?ekI5QUVFOERwcFMrNFlSZEt3aEhEeU1KbmNRVVR5TlRLUXlVb2hRMGk2c3c4?= =?utf-8?B?OGs4bDdsenUyekVUNVFObGJPY1hGNkY4aDdLanNFZHk4SnJ5cGkvU21QZWdM?= =?utf-8?B?TFowanZ2T2s2RmRPK1VSQnRjUllDNjI5VCtvaS91WGMrVWN3R0NvU2VVZG9r?= =?utf-8?B?c3A2Y3A1ZkJ4T1pUNGNHTUx4ZlMwS1FTM1drdEo1VFJveDZiczZlTTFCbU16?= =?utf-8?B?eDk0OG5ZUWRrRXovc0VCUEtiNmdzRll3NDV4cWVzdnJjMUFyb3NGdmhrdmUy?= =?utf-8?B?L3ZIOUJJWm9yb2VMWnpXQlZRbm5qVzdnVEttMkJ6bmhLUnQ4VjNKQjRnK1dj?= =?utf-8?B?K0pZRmpBdVhtOTdpTG9HVUdTS0xMOUg3VE1hMUpIRTBhQVduVGVJdEJBRGgy?= =?utf-8?B?eVUyTy9oVkVBR2RCcU5kNHI3UStQeVB6UFJmVWJoNkpqZi9TTjBvS2x3cHdm?= =?utf-8?B?UGFNWTVYZWxzd2JnaHAzRWtib1E0QkZ6NmtNbktmMFlhNTJ6eUhPUHFWMW5T?= =?utf-8?B?RDVpdEExYnNYeGZkU2Q4bGg1QWlrNGdOK2ZIWElhMGJnTDB1YzRZM21XY1Vq?= =?utf-8?B?NGJyOFhnTmJ2U2VXQzRKVnh6em9NMlBTZ0lwV3piUzNtczlsa0V3TFJFMU4z?= =?utf-8?B?a1ArMEJLU054MnZVMmRWMXRqVTByT1g4MG9GVERZd2Q0a3ZUaFkzQTczT1pv?= =?utf-8?B?bDh4a2luL1VuNHhnSy9uUFg2WmdRUzR2cWNqQTJsVUlmd2JsMVkramdjeDRq?= =?utf-8?B?NittRGhWNElwSGs0SHJQNGFUMWRmK0dlVVFIOFV6L1VMd05jOTI4SG5pbTkx?= =?utf-8?B?eHh1OHQ3MjlUOS9MdC9TL1grTHY5WHQyalRGcjdvYkxWOFZYT0NDWGZsb0VY?= =?utf-8?B?cWcwU2dmb1Q3Zk8rUkVYTUIxTXQ5Z0QrdW41T3lCREpycnlVWnozK1BEV3lr?= =?utf-8?B?WTR4bFlWcTRKZ3ptY3Eyckw0bHBrSkNvd0JZZnRSUHJUVEFRQVN0eUdObERu?= =?utf-8?B?azZRWjd3WlRwZGZvMmdCckIrRTQrQjhsQ3pRaVhaMDRHR1ZCbXBPT1V4MTNm?= =?utf-8?B?cytUbmZnWktueHRnVDJMNk9EQTgwZnBNSXNyWThpR0VzeVFRQ3ZCZy9tNHdQ?= =?utf-8?B?VVRnb2tLRmpiS3VJU3RFK1liaGg1YUdmeHFKRnd3TUtpWUtxcHVGcDlOUjZR?= =?utf-8?B?cEl4TE5wVHp3aHU3VTJTQ1Q0OUZ3Q2pXYUJRbWNqNDJlWDIyL3ZYOGpxNmVD?= =?utf-8?B?RzNJYklEYkZ5aWdrUU8wM3dhbStoeE5rWmg3aVFkejZyVHZ0eTBSR3NGclhL?= =?utf-8?B?bWNpcmx1OUhnZXlnVzY1SGc0b2ZPSVdjSUoxS1hSWmk3RW5lZXdTY1ZVRHZ0?= =?utf-8?B?aFA1N0V6cFdoa09kQ1VrOVpVOEtWRXZsbFZnODQyZEh4UEtHVHZTeURUTGo2?= =?utf-8?B?VStuK0N2QVlmUHNWL2dNdEhSbmsxT0RkN0lKWVpOUDhHcE43dWNvVUdQY2xv?= =?utf-8?B?dU9OM1lDZklXQUpONFNwVkhhbXQ0V0duaHBqMHlNK3EyblNzNk9IbDVqUXpk?= =?utf-8?Q?la3s+hIMsax7vbRWqNsH?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c6a781d-a0d5-4565-d4a4-08db774a2120 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2023 20:07:27.2255 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0257 Subject: Re: [FFmpeg-devel] [PATCH v4 1/4] 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 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: Leo Izen: > 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. > --- > libavcodec/libjxldec.c | 38 ++++++++++++++++++++++---------------- > 1 file changed, 22 insertions(+), 16 deletions(-) > > diff --git a/libavcodec/libjxldec.c b/libavcodec/libjxldec.c > index 50417bcb02..e516c29be5 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); > } > @@ -351,10 +355,12 @@ static int libjxl_receive_frame(AVCodecContext *avctx, AVFrame *frame) > size_t remaining; > > if (!pkt->size) { > + av_log(avctx, AV_LOG_DEBUG, "Fetching new packet\n"); > av_packet_unref(pkt); > ret = ff_decode_get_packet(avctx, pkt); > if (ret < 0 && ret != AVERROR_EOF) > return ret; > + av_log(avctx, AV_LOG_DEBUG, "Fetched packet of size: %d\n", pkt->size); These logs have nothing to do with what the patch is supposed to do (and they would belong in ff_decode_get_packet() anyway instead of in a single user). > if (!pkt->size) { > /* jret set by the last iteration of the loop */ > if (jret == JXL_DEC_NEED_MORE_INPUT) { > @@ -389,10 +395,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"); > @@ -421,16 +423,18 @@ 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) > + if ((ret = libjxl_color_encoding_event(avctx, ctx->frame)) < 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; > } > @@ -444,8 +448,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; > @@ -464,20 +468,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"); > @@ -508,6 +513,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; > } _______________________________________________ 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".