Skip to content

Commit

Permalink
lavc/libx265: unbreak build for X265_BUILD >= 210
Browse files Browse the repository at this point in the history
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
  • Loading branch information
GyanD committed Aug 15, 2024
1 parent 66c05dc commit 1f801df
Showing 1 changed file with 30 additions and 10 deletions.
40 changes: 30 additions & 10 deletions libavcodec/libx265.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 1f801df

Please sign in to comment.