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 847A540519 for ; Thu, 24 Feb 2022 09:44:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7825668B2DF; Thu, 24 Feb 2022 11:44:47 +0200 (EET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067029.outbound.protection.outlook.com [40.92.67.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D1FF68B1B5 for ; Thu, 24 Feb 2022 11:44:41 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MjLgZXB/JLZFPZ2o/lbtO7BzK/wAH5phk8PMpkKkox0sUDV+PTCzcxy7M62FBMVS18NBUjJI5j1AuNpUfWIJLU6mACKhimLbMv0O6Y2pH2QECKskEoQ78S8o/eStDGiB+5OwftwBlbmIAl9yYDLPkNRTZmgd/Vn6pDZi525zmsTPdVcCBK3+8knE7gB2pgbZypwHYMqRi4QhlU4/cRsg7Lit+/UyuVt151Zy2ONrB7W4zBHKlaSRhRJowablBgiQS7uhhcP8HpmXGWgLv5MGJkRiKUAX44TNr9CT87S82XLckUu2kqzqbUwmaDYFHu7W9QAy9lr346u7UvTLfSvvBA== 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=34NFiS0fFogA0rU2sdJxohu1HUHbh1wfPmVxXyFjUq0=; b=gDZ8xTVCu/Lm9Sr6EpeF5oTDJf+UwTRDWcxluCSimzqtbwyQ1CZNt7e0xkJIamDkVEWT0+BI5HBRZqKW7uk7TZ01bhh0+V0aYaz2nwtTiUaInnDwe02gXYAY6D2DuK1nToDREfznQsweYSytrdL/usu1LYX9dRDGabXlWEGJptiIq49+Qx69KlZj7E2xyBU7ZC7ISiRAnhielQHOE7p0Ff4H62Kqm3TZoR7YEM0RGf+U+oqpSdYsaGBsj3uswwmcQR9Fw5kt5QMAOmo4ywUnCjeooycgzdheA+GlIqxVtf4Xw7HsmeXL+wDBWlDdNXWRv18OPKjMYgKxQ2s2sWuilw== 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=34NFiS0fFogA0rU2sdJxohu1HUHbh1wfPmVxXyFjUq0=; b=b/wa1hocUu8On7iuut9FI65ZwZ4TAGqs3EAfA8jBvM9CJJVT7fbFyc53jFWJyy2NsRiBknC1YIw32Jdtehp1C4N6Z9SbCFDf90fZmFl6cjXOwEo8la1lLo9UrB9S17jLq6HtuPPPKplbfR250zQg4yKSBHPlEKdvfeQUoKgTMLI2aC2LLp1bw1tfzi73JCQjQsURpNBmf1yYA3PuH2Z+ParWg3rhi/Of9rqu8dBokwvqH0xwXDOOxNwHr9waeDe9w7yctmHH0LZ4w5CbJ59nCzBjZ5XGDlW5KXT5RgrV4qGtOONNMaZF7TdiBKva/JP3IUiTal0yF2TRskeWBzwN/g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5140.eurprd03.prod.outlook.com (2603:10a6:20b:c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.24; Thu, 24 Feb 2022 09:44:40 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%6]) with mapi id 15.20.5017.022; Thu, 24 Feb 2022 09:44:40 +0000 Message-ID: Date: Thu, 24 Feb 2022 10:44:38 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [kBJODYu8HKyvplGhUOcYoYP5XAgaXP6w] X-ClientProxiedBy: FR3P281CA0053.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::6) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1c6c2f21-ecc0-457a-52c3-08d9f77a46cd X-MS-TrafficTypeDiagnostic: AM6PR03MB5140:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0T9uSw5JNc4TDkgjipGp6CAA9ZKTc8OjUs6mlHka4Pb5n6YM3dj3oWVp8xLnPYtMmpWyuizrtq9riteHiGw8BUQEpmITNA4eMbWxUlIxSzIGoUixNbxderpOqCrb9IuDLyuWifsDGcvX6k9uuoUd2wbEbcjqdORzQtr9+h/i6bY1FgbIUd/7Citz8kXH2Kw3INhwHVow8pYEQaT4SjN0BkEiN4u2oS8LbOJofyy5faSbBAL9Gq4euTrCYLkMnTfVtsM5Etclh8MhVZo0a6tBu3AnhcWI8GF3jegXgTXYARPNTtac9FXz3eYKMDDOSQSuCU4/I0RhUUxv4DXijsT/JKThPnKH68CRP9qwUt9TowS2HHV0qxxFXVDH+MbX/85ScaDPKa0TrJ4/l6Tx0YFf7hB5cp6Sp8EmdC9gGVgpvrnesCB+8y+Mg/YqaamEFSqtKJgFWJOHZrBiB2G2snXdeSIZWBvbKVM9TU17ytit3l/dEHkbdlgtGW3D+Ng2PcaAOOxrmG0zYCKhlWn+ujFRbcXtD4BijV3agl7wZbDRjpj9gsIpw/HI9UIyf7oIx0CTQKaVKA7MA3MlHb4iXVrTMQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cXpKVFBhUmVVWVFzYkdrTStmdFRvSUFLYTVTM3ZhMFNTYm9aZDRCVjg3d3pn?= =?utf-8?B?SDIwL2NIKzV3THAwNVFxNkh4K2EyNzAxUWFONEp5YVBBN0xtaFVxVVZsMzJX?= =?utf-8?B?Rzd1cXpQNVJDQnVxcVJvNmFBZ0NOdWFWWkYrbitqZndoOTFxU1dhamdMcUpT?= =?utf-8?B?NDFCSlhjL1hZa0VUK0ZybzZ6cHNZUEZubHFKeVdEUVJNWkZsK3JXUW9yZ0dt?= =?utf-8?B?MjhQSkQ5dXZxVThURVVSSGlIL3lTRXFYa2k3K2RHMEZjZ3JMMy9JNHFmNm5k?= =?utf-8?B?dlBXNlZTYU0vVHRFNlJPdFgyVHhSUXZIREVqZjM1UjZKZkJBaDdXK1RiTGMz?= =?utf-8?B?azFKYkd2SHdJZm56OXB0TTBHeFZWdDhqVkZmOEU2ZHY2aUk3b3hwQVk3UXlq?= =?utf-8?B?YzVma3pRS2JJMURCMU44d1dxR2tXRGMrdXN3cE5lOW9uTm1Rb2NCNXRKSEho?= =?utf-8?B?VVFjWVRPL1FQWDFCQ0xnVkd6L05CS0JqUU8waTh4SGd0ckFlN1hYaU5jWU8z?= =?utf-8?B?M0NRSlJkSFd0Z1Q1NVZMV0VjblJrNHNDdDVMN3VFcG0zR1I2ZU52Tk5JWEhi?= =?utf-8?B?a2tQTkhYZlUxUEpvOE95dVh0eUNCNHh6QVRDdWJkYmd4TEFIVFRiQ1F5M0lG?= =?utf-8?B?ZlFiUlV3cFRZVTBhQy9xV0h6RlRSQUZ1Z1lyNUJZZXd5aDRYZG9sbVJjOEpL?= =?utf-8?B?bHI4OXdieWgvRzE4M2kwSUFjanV4MG9QQVpnUUdleElZZVMwSjlNWEFQM3lF?= =?utf-8?B?VlI5ZnZ1RUM1c2QvK1R4alZ3bVZXc1NNS2VNTG1LQkhPQm0xZDZiY1pVSk01?= =?utf-8?B?OEZoeVF4ZDhGdzBKb3k4enY2RmtCL05HRW9OeWFmRmFwWlMzSjZBcXNKeTJm?= =?utf-8?B?cHdJTnRrRTVGWUtvRnhKMjF2VVo2UlNyRnovM0k5Rzh5OGJTZVJzbFdHYVlv?= =?utf-8?B?NkhsdjJ4OURvSU1iRUdxdE03WmJJTVUwdUJVRUlLVVk1cHB6NlVhTHNCazlE?= =?utf-8?B?d1ljMklaT1FBMjRieENsUy9EMzh0MjdYRXZEcFJBWDQ5WFJVd00wNXo1R3ox?= =?utf-8?B?OWpDMll1TTVlTElVYThod0xOYUtVZUt6aStNbjZKd21vT1djcm1Cd0dVLzdr?= =?utf-8?B?N3lJYnZ5dVZwTzJkcmRzb3FEc3l5TnJiL08vSUdKNDBBbjg5MDJrVUVYcFlR?= =?utf-8?B?d1JJUEdzNEJ3dllzVVg1YkpnbnRkakQxTUJWYjd2b1U0a3JNRm0yQVpFNmRz?= =?utf-8?B?enNEbzh6OVNGUVBmR3lzendPb2wzbG9GMWtXS1RZZDN5UGY3dz09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c6c2f21-ecc0-457a-52c3-08d9f77a46cd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2022 09:44:40.1191 (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: AM6PR03MB5140 Subject: Re: [FFmpeg-devel] [PATCH 4/5] avcodec/libopenjpegenc: Don't clone AVFrame unnecessarily 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: Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/libopenjpegenc.c | 83 +++++++++++++++++++------------------ > 1 file changed, 42 insertions(+), 41 deletions(-) > > diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c > index 3e52bcd4e9..08b7b6a152 100644 > --- a/libavcodec/libopenjpegenc.c > +++ b/libavcodec/libopenjpegenc.c > @@ -345,7 +345,8 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx) > return 0; > } > > -static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) > +static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const uint8_t *src[4], > + const int linesize[4], opj_image_t *image) > { > int compno; > int x; > @@ -355,7 +356,7 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, > const int numcomps = image->numcomps; > > for (compno = 0; compno < numcomps; ++compno) { > - if (image->comps[compno].w > frame->linesize[0] / numcomps) { > + if (image->comps[compno].w > linesize[0] / numcomps) { > av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); > return 0; > } > @@ -364,9 +365,9 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, > for (compno = 0; compno < numcomps; ++compno) { > for (y = 0; y < avctx->height; ++y) { > image_line = image->comps[compno].data + y * image->comps[compno].w; > - frame_index = y * frame->linesize[0] + compno; > + frame_index = y * linesize[0] + compno; > for (x = 0; x < avctx->width; ++x) { > - image_line[x] = frame->data[0][frame_index]; > + image_line[x] = src[0][frame_index]; > frame_index += numcomps; > } > for (; x < image->comps[compno].w; ++x) { > @@ -385,17 +386,18 @@ static int libopenjpeg_copy_packed8(AVCodecContext *avctx, const AVFrame *frame, > } > > // for XYZ 12 bit > -static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) > +static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const uint8_t *src[4], > + const int linesize[4], opj_image_t *image) > { > int compno; > int x, y; > int *image_line; > int frame_index; > const int numcomps = image->numcomps; > - uint16_t *frame_ptr = (uint16_t *)frame->data[0]; > + const uint16_t *frame_ptr = (const uint16_t *)src[0]; > > for (compno = 0; compno < numcomps; ++compno) { > - if (image->comps[compno].w > frame->linesize[0] / numcomps) { > + if (image->comps[compno].w > linesize[0] / numcomps) { > av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); > return 0; > } > @@ -404,7 +406,7 @@ static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const AVFrame *frame > for (compno = 0; compno < numcomps; ++compno) { > for (y = 0; y < avctx->height; ++y) { > image_line = image->comps[compno].data + y * image->comps[compno].w; > - frame_index = y * (frame->linesize[0] / 2) + compno; > + frame_index = y * (linesize[0] / 2) + compno; > for (x = 0; x < avctx->width; ++x) { > image_line[x] = frame_ptr[frame_index] >> 4; > frame_index += numcomps; > @@ -424,7 +426,8 @@ static int libopenjpeg_copy_packed12(AVCodecContext *avctx, const AVFrame *frame > return 1; > } > > -static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) > +static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const uint8_t *src[4], > + const int linesize[4], opj_image_t *image) > { > int compno; > int x; > @@ -432,10 +435,10 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame > int *image_line; > int frame_index; > const int numcomps = image->numcomps; > - uint16_t *frame_ptr = (uint16_t*)frame->data[0]; > + const uint16_t *frame_ptr = (const uint16_t*)src[0]; > > for (compno = 0; compno < numcomps; ++compno) { > - if (image->comps[compno].w > frame->linesize[0] / numcomps) { > + if (image->comps[compno].w > linesize[0] / numcomps) { > av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); > return 0; > } > @@ -444,7 +447,7 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame > for (compno = 0; compno < numcomps; ++compno) { > for (y = 0; y < avctx->height; ++y) { > image_line = image->comps[compno].data + y * image->comps[compno].w; > - frame_index = y * (frame->linesize[0] / 2) + compno; > + frame_index = y * (linesize[0] / 2) + compno; > for (x = 0; x < avctx->width; ++x) { > image_line[x] = frame_ptr[frame_index]; > frame_index += numcomps; > @@ -464,7 +467,8 @@ static int libopenjpeg_copy_packed16(AVCodecContext *avctx, const AVFrame *frame > return 1; > } > > -static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) > +static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const uint8_t *src[4], > + const int linesize[4], opj_image_t *image) > { > int compno; > int x; > @@ -476,7 +480,7 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *fram > const int numcomps = image->numcomps; > > for (compno = 0; compno < numcomps; ++compno) { > - if (image->comps[compno].w > frame->linesize[compno]) { > + if (image->comps[compno].w > linesize[compno]) { > av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); > return 0; > } > @@ -487,9 +491,9 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *fram > height = (avctx->height + image->comps[compno].dy - 1) / image->comps[compno].dy; > for (y = 0; y < height; ++y) { > image_line = image->comps[compno].data + y * image->comps[compno].w; > - frame_index = y * frame->linesize[compno]; > + frame_index = y * linesize[compno]; > for (x = 0; x < width; ++x) > - image_line[x] = frame->data[compno][frame_index++]; > + image_line[x] = src[compno][frame_index++]; > for (; x < image->comps[compno].w; ++x) { > image_line[x] = image_line[x - 1]; > } > @@ -505,7 +509,8 @@ static int libopenjpeg_copy_unpacked8(AVCodecContext *avctx, const AVFrame *fram > return 1; > } > > -static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const AVFrame *frame, opj_image_t *image) > +static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const uint8_t *src[4], > + const int linesize[4], opj_image_t *image) > { > int compno; > int x; > @@ -515,22 +520,21 @@ static int libopenjpeg_copy_unpacked16(AVCodecContext *avctx, const AVFrame *fra > int *image_line; > int frame_index; > const int numcomps = image->numcomps; > - uint16_t *frame_ptr; > > for (compno = 0; compno < numcomps; ++compno) { > - if (image->comps[compno].w > frame->linesize[compno]) { > + if (image->comps[compno].w > linesize[compno]) { > av_log(avctx, AV_LOG_ERROR, "Error: frame's linesize is too small for the image\n"); > return 0; > } > } > > for (compno = 0; compno < numcomps; ++compno) { > + const uint16_t *frame_ptr = (const uint16_t *)src[compno]; > width = (avctx->width + image->comps[compno].dx - 1) / image->comps[compno].dx; > height = (avctx->height + image->comps[compno].dy - 1) / image->comps[compno].dy; > - frame_ptr = (uint16_t *)frame->data[compno]; > for (y = 0; y < height; ++y) { > image_line = image->comps[compno].data + y * image->comps[compno].w; > - frame_index = y * (frame->linesize[compno] / 2); > + frame_index = y * (linesize[compno] / 2); > for (x = 0; x < width; ++x) > image_line[x] = frame_ptr[frame_index++]; > for (; x < image->comps[compno].w; ++x) { > @@ -553,12 +557,15 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > { > LibOpenJPEGContext *ctx = avctx->priv_data; > int ret; > - AVFrame *gbrframe; > int cpyresult = 0; > PacketWriter writer = { 0 }; > opj_codec_t *compress = NULL; > opj_stream_t *stream = NULL; > opj_image_t *image = mj2_create_image(avctx, &ctx->enc_params); > + const uint8_t *data[4] = { frame->data[0], frame->data[1], > + frame->data[2], frame->data[3] }; > + int linesize[4] = { frame->linesize[0], frame->linesize[1], > + frame->linesize[2], frame->linesize[3] }; > if (!image) { > av_log(avctx, AV_LOG_ERROR, "Error creating the mj2 image\n"); > ret = AVERROR(EINVAL); > @@ -569,15 +576,15 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > case AV_PIX_FMT_RGB24: > case AV_PIX_FMT_RGBA: > case AV_PIX_FMT_YA8: > - cpyresult = libopenjpeg_copy_packed8(avctx, frame, image); > + cpyresult = libopenjpeg_copy_packed8(avctx, data, linesize, image); > break; > case AV_PIX_FMT_XYZ12: > - cpyresult = libopenjpeg_copy_packed12(avctx, frame, image); > + cpyresult = libopenjpeg_copy_packed12(avctx, data, linesize, image); > break; > case AV_PIX_FMT_RGB48: > case AV_PIX_FMT_RGBA64: > case AV_PIX_FMT_YA16: > - cpyresult = libopenjpeg_copy_packed16(avctx, frame, image); > + cpyresult = libopenjpeg_copy_packed16(avctx, data, linesize, image); > break; > case AV_PIX_FMT_GBR24P: > case AV_PIX_FMT_GBRP9: > @@ -585,23 +592,17 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > case AV_PIX_FMT_GBRP12: > case AV_PIX_FMT_GBRP14: > case AV_PIX_FMT_GBRP16: > - gbrframe = av_frame_clone(frame); > - if (!gbrframe) { > - ret = AVERROR(ENOMEM); > - goto done; > - } > - gbrframe->data[0] = frame->data[2]; // swap to be rgb > - gbrframe->data[1] = frame->data[0]; > - gbrframe->data[2] = frame->data[1]; > - gbrframe->linesize[0] = frame->linesize[2]; > - gbrframe->linesize[1] = frame->linesize[0]; > - gbrframe->linesize[2] = frame->linesize[1]; > + data[0] = frame->data[2]; // swap to be rgb > + data[1] = frame->data[0]; > + data[2] = frame->data[1]; > + linesize[0] = frame->linesize[2]; > + linesize[1] = frame->linesize[0]; > + linesize[2] = frame->linesize[1]; > if (avctx->pix_fmt == AV_PIX_FMT_GBR24P) { > - cpyresult = libopenjpeg_copy_unpacked8(avctx, gbrframe, image); > + cpyresult = libopenjpeg_copy_unpacked8(avctx, data, linesize, image); > } else { > - cpyresult = libopenjpeg_copy_unpacked16(avctx, gbrframe, image); > + cpyresult = libopenjpeg_copy_unpacked16(avctx, data, linesize, image); > } > - av_frame_free(&gbrframe); > break; > case AV_PIX_FMT_GRAY8: > case AV_PIX_FMT_YUV410P: > @@ -613,7 +614,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > case AV_PIX_FMT_YUVA420P: > case AV_PIX_FMT_YUVA422P: > case AV_PIX_FMT_YUVA444P: > - cpyresult = libopenjpeg_copy_unpacked8(avctx, frame, image); > + cpyresult = libopenjpeg_copy_unpacked8(avctx, data, linesize, image); > break; > case AV_PIX_FMT_GRAY10: > case AV_PIX_FMT_GRAY12: > @@ -643,7 +644,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > case AV_PIX_FMT_YUVA444P16: > case AV_PIX_FMT_YUVA422P16: > case AV_PIX_FMT_YUVA420P16: > - cpyresult = libopenjpeg_copy_unpacked16(avctx, frame, image); > + cpyresult = libopenjpeg_copy_unpacked16(avctx, data, linesize, image); > break; > default: > av_log(avctx, AV_LOG_ERROR, Will apply this tomorrow unless there are objections. - Andreas _______________________________________________ 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".