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 EABF14CAE4 for ; Wed, 14 Aug 2024 04:32:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5341868D9E8; Wed, 14 Aug 2024 07:32:13 +0300 (EEST) Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [80.241.56.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A716768D974 for ; Wed, 14 Aug 2024 07:32:06 +0300 (EEST) Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4WkFhf3Hq7z9tGg for ; Wed, 14 Aug 2024 06:32:02 +0200 (CEST) Message-ID: <765a94ee-51da-43ea-8274-33b2deaf77e5@gyani.pro> Date: Wed, 14 Aug 2024 10:01:58 +0530 MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org References: <20240811103300.11627-1-ffmpeg@gyani.pro> Content-Language: en-US From: Gyan Doshi In-Reply-To: <20240811103300.11627-1-ffmpeg@gyani.pro> Subject: Re: [FFmpeg-devel] [PATCH] lavc/libx265: unbreak build for X265_BUILD >= 210 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2024-08-11 04:03 pm, Gyan Doshi wrote: > x265 added support for alpha starting with build 210. > While doing so, x265_encoder_encode() changed its fifth arg to > an array of pointers to x265_picture. This broke building lavc/libx265.c > > This patch simply unbreaks the build and maintains existing single-layer > non-alpha encoding support. > > Fixes #11130 Plan to push tomorrow. Building with x265 HEAD has been broken for over a week now. Regards, Gyan > --- > libavcodec/libx265.c | 40 ++++++++++++++++++++++++++++++---------- > 1 file changed, 30 insertions(+), 10 deletions(-) > > diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c > index 0dc7ab6eeb..3bc3b5a03e 100644 > --- a/libavcodec/libx265.c > +++ b/libavcodec/libx265.c > @@ -661,7 +661,13 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > { > libx265Context *ctx = avctx->priv_data; > x265_picture x265pic; > - x265_picture x265pic_out = { 0 }; > +#if X265_BUILD >= 210 > + x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS]; > + x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS]; > +#else > + x265_picture x265pic_solo_out = { 0 }; > +#endif > + x265_picture* x265pic_out; > x265_nal *nal; > x265_sei *sei; > uint8_t *dst; > @@ -798,8 +804,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > #endif > } > > +#if X265_BUILD >= 210 > + for (i = 0; i < MAX_SCALABLE_LAYERS; i++) > + x265pic_lyrptr_out[i] = &x265pic_layers_out[i]; > + > + ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal, > + pic ? &x265pic : NULL, x265pic_lyrptr_out); > +#else > ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal, > - pic ? &x265pic : NULL, &x265pic_out); > + pic ? &x265pic : NULL, &x265pic_solo_out); > +#endif > > for (i = 0; i < sei->numPayloads; i++) > av_free(sei->payloads[i].payload); > @@ -829,10 +843,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > pkt->flags |= AV_PKT_FLAG_KEY; > } > > - pkt->pts = x265pic_out.pts; > - pkt->dts = x265pic_out.dts; > +#if X265_BUILD >= 210 > + x265pic_out = x265pic_lyrptr_out[0]; > +#else > + x265pic_out = &x265pic_solo_out; > +#endif > + > + pkt->pts = x265pic_out->pts; > + pkt->dts = x265pic_out->dts; > > - switch (x265pic_out.sliceType) { > + switch (x265pic_out->sliceType) { > case X265_TYPE_IDR: > case X265_TYPE_I: > pict_type = AV_PICTURE_TYPE_I; > @@ -850,16 +870,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, > } > > #if X265_BUILD >= 130 > - if (x265pic_out.sliceType == X265_TYPE_B) > + if (x265pic_out->sliceType == X265_TYPE_B) > #else > - if (x265pic_out.frameData.sliceType == 'b') > + if (x265pic_out->frameData.sliceType == 'b') > #endif > pkt->flags |= AV_PKT_FLAG_DISPOSABLE; > > - ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type); > + ff_side_data_set_encoder_stats(pkt, x265pic_out->frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type); > > - if (x265pic_out.userData) { > - int idx = (int)(intptr_t)x265pic_out.userData - 1; > + if (x265pic_out->userData) { > + int idx = (int)(intptr_t)x265pic_out->userData - 1; > ReorderedData *rd = &ctx->rd[idx]; > > pkt->duration = rd->duration; _______________________________________________ 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".