Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build of FFmpeg with libx265 X265_BUILD >= 210 and X265_BUILD < 213 (fixes/34) #970

Open
wants to merge 2 commits into
base: fixes/34
Choose a base branch
from
Open

Fix build of FFmpeg with libx265 X265_BUILD >= 210 and X265_BUILD < 213 (fixes/34) #970

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfafa81
lavc/libx265: unbreak build for X265_BUILD >= 210
GyanD Aug 11, 2024
58e2225
avcodec/libx265: unbreak build for X265_BUILD >= 213
GyanD Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 31 additions & 11 deletions mythtv/external/FFmpeg/libavcodec/libx265.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,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_BUILD < 213)
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;
uint8_t *dst;
int pict_type;
Expand Down Expand Up @@ -575,8 +581,16 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
}

#if (X265_BUILD >= 210) && (X265_BUILD < 213)
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

av_freep(&x265pic.quantOffsets);

Expand Down Expand Up @@ -604,10 +618,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) && (X265_BUILD < 213)
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 @@ -625,17 +645,17 @@ 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) {
memcpy(&avctx->reordered_opaque, x265pic_out.userData, sizeof(avctx->reordered_opaque));
av_freep(&x265pic_out.userData);
if (x265pic_out->userData) {
memcpy(&avctx->reordered_opaque, x265pic_out->userData, sizeof(avctx->reordered_opaque));
av_freep(&x265pic_out->userData);
} else
avctx->reordered_opaque = 0;

Expand Down