virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc/libx265: unbreak build for X265_BUILD >= 210

Browse Source 
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
This commit is contained in:
Gyan Doshi 2024-08-11 12:51:50 +05:30 committed by Timo Rothenpieler
parent a041b7be2c
commit f749aaf108
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/libx265.c
View File

@ -581,7 +581,13 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
{ {
libx265Context *ctx = avctx->priv_data; libx265Context *ctx = avctx->priv_data;
x265_picture x265pic; 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_nal *nal;
x265_sei *sei; x265_sei *sei;
uint8_t *dst; uint8_t *dst;
@ -704,8 +710,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
} }
#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, ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
pic ? &x265pic : NULL, &x265pic_out); pic ? &x265pic : NULL, x265pic_lyrptr_out);
#else
ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
pic ? &x265pic : NULL, &x265pic_solo_out);
#endif
for (i = 0; i < sei->numPayloads; i++) for (i = 0; i < sei->numPayloads; i++)
av_free(sei->payloads[i].payload); av_free(sei->payloads[i].payload);
@ -735,10 +749,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
} }
pkt->pts = x265pic_out.pts; #if X265_BUILD >= 210
pkt->dts = x265pic_out.dts; x265pic_out = x265pic_lyrptr_out[0];
#else
x265pic_out = &x265pic_solo_out;
#endif
switch (x265pic_out.sliceType) { pkt->pts = x265pic_out->pts;
pkt->dts = x265pic_out->dts;
switch (x265pic_out->sliceType) {
case X265_TYPE_IDR: case X265_TYPE_IDR:
case X265_TYPE_I: case X265_TYPE_I:
pict_type = AV_PICTURE_TYPE_I; pict_type = AV_PICTURE_TYPE_I;
@ -756,16 +776,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
} }
#if X265_BUILD >= 130 #if X265_BUILD >= 130
if (x265pic_out.sliceType == X265_TYPE_B) if (x265pic_out->sliceType == X265_TYPE_B)
#else #else
if (x265pic_out.frameData.sliceType == 'b') if (x265pic_out->frameData.sliceType == 'b')
#endif #endif
pkt->flags |= AV_PKT_FLAG_DISPOSABLE; 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) { if (x265pic_out->userData) {
int idx = (int)(intptr_t)x265pic_out.userData - 1; int idx = (int)(intptr_t)x265pic_out->userData - 1;
ReorderedData *rd = &ctx->rd[idx]; ReorderedData *rd = &ctx->rd[idx];
#if FF_API_REORDERED_OPAQUE #if FF_API_REORDERED_OPAQUE