virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/dovi_rpuenc: Avoid intermediate codec par in ff_dovi_configure()

Browse Source 
It invalidates (removes by duplicates)  AVCodecContext.extradata
and AVCodecContext.coded_side_data which is quite surprising
and leads to bugs like #11617 where an AVCPBProperties
is used after it has been freed in ff_dovi_configure().

Reported-by: Ayose
Reviewed-by: Niklas Haas <ffmpeg@haasn.xyz>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-05-30 18:06:55 +02:00
parent ab37c7e49f
commit 8d45dc858e
3 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/bsf/dovi_rpu.c
View File

@ -228,8 +228,8 @@ static int dovi_rpu_init(AVBSFContext *bsf)
} else { } else {
av_log(bsf, AV_LOG_WARNING, "No Dolby Vision configuration record " av_log(bsf, AV_LOG_WARNING, "No Dolby Vision configuration record "
"found? Generating one, but results may be invalid.\n"); "found? Generating one, but results may be invalid.\n");
ret = ff_dovi_configure_ext(&s->enc, bsf->par_out, NULL, s->compression, ret = ff_dovi_configure_from_codedpar(&s->enc, bsf->par_out, NULL, s->compression,
FF_COMPLIANCE_NORMAL); FF_COMPLIANCE_NORMAL);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* Be conservative in accepting all compressed RPUs */ /* Be conservative in accepting all compressed RPUs */

17
libavcodec/dovi_rpu.h
View File

@ -133,9 +133,10 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame);
/** /**
* Configure the encoder for Dolby Vision encoding. Generates a configuration * Configure the encoder for Dolby Vision encoding. Generates a configuration
* record in s->cfg, and attaches it to avctx->coded_side_data. Sets the correct * record in s->cfg, and attaches it to codecpar->coded_side_data. Sets the
* profile and compatibility ID based on the tagged AVCodecParameters colorspace * correct profile and compatibility ID based on the tagged AVCodecParameters
* metadata, and the correct level based on the resolution and tagged framerate. * colorspace metadata, and the correct level based on the resolution and
* tagged framerate.
* *
* `metadata` should point to the first frame's RPU, if available. If absent, * `metadata` should point to the first frame's RPU, if available. If absent,
* auto-detection will be performed, but this can sometimes lead to inaccurate * auto-detection will be performed, but this can sometimes lead to inaccurate
@ -143,13 +144,13 @@ int ff_dovi_attach_side_data(DOVIContext *s, AVFrame *frame);
* *
* Returns 0 or a negative error code. * Returns 0 or a negative error code.
*/ */
int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar, int ff_dovi_configure_from_codedpar(DOVIContext *s, AVCodecParameters *codecpar,
const AVDOVIMetadata *metadata, const AVDOVIMetadata *metadata,
enum AVDOVICompression compression, enum AVDOVICompression compression,
int strict_std_compliance); int strict_std_compliance);
/** /**
* Helper wrapper around `ff_dovi_configure_ext` which infers the codec * Variant of `ff_dovi_configure_from_codedpar` which infers the codec
* parameters from an AVCodecContext. * parameters from an AVCodecContext.
*/ */
int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx); int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx);

100
libavcodec/dovi_rpuenc.c
View File

@ -52,10 +52,18 @@ static const struct {
[13] = {7680*4320*120u, 7680, 240, 800}, [13] = {7680*4320*120u, 7680, 240, 800},
}; };
int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar, static int dovi_configure_ext(DOVIContext *s, enum AVCodecID codec_id,
const AVDOVIMetadata *metadata, const AVDOVIMetadata *metadata,
enum AVDOVICompression compression, enum AVDOVICompression compression,
int strict_std_compliance) int strict_std_compliance,
int width, int height,
AVRational framerate,
enum AVPixelFormat pix_format,
enum AVColorSpace color_space,
enum AVColorPrimaries color_primaries,
enum AVColorTransferCharacteristic color_trc,
AVPacketSideData **coded_side_data,
int *nb_coded_side_data)
{ {
AVDOVIDecoderConfigurationRecord *cfg; AVDOVIDecoderConfigurationRecord *cfg;
const AVDOVIRpuDataHeader *hdr = NULL; const AVDOVIRpuDataHeader *hdr = NULL;
@ -76,7 +84,7 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
compression > AV_DOVI_COMPRESSION_EXTENDED) compression > AV_DOVI_COMPRESSION_EXTENDED)
return AVERROR(EINVAL); return AVERROR(EINVAL);
switch (codecpar->codec_id) { switch (codec_id) {
case AV_CODEC_ID_AV1: dv_profile = 10; break; case AV_CODEC_ID_AV1: dv_profile = 10; break;
case AV_CODEC_ID_H264: dv_profile = 9; break; case AV_CODEC_ID_H264: dv_profile = 9; break;
case AV_CODEC_ID_HEVC: case AV_CODEC_ID_HEVC:
@ -86,9 +94,9 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
} }
/* This is likely to be proprietary IPTPQc2 */ /* This is likely to be proprietary IPTPQc2 */
if (codecpar->color_space == AVCOL_SPC_IPT_C2 || if (color_space == AVCOL_SPC_IPT_C2 ||
(codecpar->color_space == AVCOL_SPC_UNSPECIFIED && (color_space == AVCOL_SPC_UNSPECIFIED &&
codecpar->color_trc == AVCOL_TRC_UNSPECIFIED)) color_trc == AVCOL_TRC_UNSPECIFIED))
dv_profile = 5; dv_profile = 5;
else else
dv_profile = 8; dv_profile = 8;
@ -101,10 +109,10 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
if (strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { if (strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) {
if (dv_profile == 9) { if (dv_profile == 9) {
if (codecpar->format != AV_PIX_FMT_YUV420P) if (pix_format != AV_PIX_FMT_YUV420P)
dv_profile = 0; dv_profile = 0;
} else { } else {
if (codecpar->format != AV_PIX_FMT_YUV420P10) if (pix_format != AV_PIX_FMT_YUV420P10)
dv_profile = 0; dv_profile = 0;
} }
} }
@ -131,17 +139,17 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
} }
/* fall through */ /* fall through */
case 8: /* HEVC (or AV1) with BL compatibility */ case 8: /* HEVC (or AV1) with BL compatibility */
if (codecpar->color_space == AVCOL_SPC_BT2020_NCL && if (color_space == AVCOL_SPC_BT2020_NCL &&
codecpar->color_primaries == AVCOL_PRI_BT2020 && color_primaries == AVCOL_PRI_BT2020 &&
codecpar->color_trc == AVCOL_TRC_SMPTE2084) { color_trc == AVCOL_TRC_SMPTE2084) {
bl_compat_id = 1; bl_compat_id = 1;
} else if (codecpar->color_space == AVCOL_SPC_BT2020_NCL && } else if (color_space == AVCOL_SPC_BT2020_NCL &&
codecpar->color_primaries == AVCOL_PRI_BT2020 && color_primaries == AVCOL_PRI_BT2020 &&
codecpar->color_trc == AVCOL_TRC_ARIB_STD_B67) { color_trc == AVCOL_TRC_ARIB_STD_B67) {
bl_compat_id = 4; bl_compat_id = 4;
} else if (codecpar->color_space == AVCOL_SPC_BT709 && } else if (color_space == AVCOL_SPC_BT709 &&
codecpar->color_primaries == AVCOL_PRI_BT709 && color_primaries == AVCOL_PRI_BT709 &&
codecpar->color_trc == AVCOL_TRC_BT709) { color_trc == AVCOL_TRC_BT709) {
bl_compat_id = 2; bl_compat_id = 2;
} }
} }
@ -175,9 +183,9 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
} }
} }
pps = codecpar->width * codecpar->height; pps = width * height;
if (codecpar->framerate.num) { if (framerate.num) {
pps = pps * codecpar->framerate.num / codecpar->framerate.den; pps = pps * framerate.num / framerate.den;
} else { } else {
pps *= 25; /* sanity fallback */ pps *= 25; /* sanity fallback */
} }
@ -186,7 +194,7 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
for (int i = 1; i < FF_ARRAY_ELEMS(dv_levels); i++) { for (int i = 1; i < FF_ARRAY_ELEMS(dv_levels); i++) {
if (pps > dv_levels[i].pps) if (pps > dv_levels[i].pps)
continue; continue;
if (codecpar->width > dv_levels[i].width) if (width > dv_levels[i].width)
continue; continue;
/* In theory, we should also test the bitrate when known, and /* In theory, we should also test the bitrate when known, and
* distinguish between main and high tier. In practice, just ignore * distinguish between main and high tier. In practice, just ignore
@ -199,12 +207,12 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
if (!dv_level) { if (!dv_level) {
if (strict_std_compliance >= FF_COMPLIANCE_STRICT) { if (strict_std_compliance >= FF_COMPLIANCE_STRICT) {
av_log(s->logctx, AV_LOG_ERROR, "Coded PPS (%"PRIu64") and width (%d) " av_log(s->logctx, AV_LOG_ERROR, "Coded PPS (%"PRIu64") and width (%d) "
"exceed Dolby Vision limitations\n", pps, codecpar->width); "exceed Dolby Vision limitations\n", pps, width);
return AVERROR(EINVAL); return AVERROR(EINVAL);
} else { } else {
av_log(s->logctx, AV_LOG_WARNING, "Coded PPS (%"PRIu64") and width (%d) " av_log(s->logctx, AV_LOG_WARNING, "Coded PPS (%"PRIu64") and width (%d) "
"exceed Dolby Vision limitations. Ignoring, resulting file " "exceed Dolby Vision limitations. Ignoring, resulting file "
"may be non-conforming.\n", pps, codecpar->width); "may be non-conforming.\n", pps, width);
dv_level = FF_ARRAY_ELEMS(dv_levels) - 1; dv_level = FF_ARRAY_ELEMS(dv_levels) - 1;
} }
} }
@ -213,8 +221,8 @@ int ff_dovi_configure_ext(DOVIContext *s, AVCodecParameters *codecpar,
if (!cfg) if (!cfg)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (!av_packet_side_data_add(&codecpar->coded_side_data, if (!av_packet_side_data_add(coded_side_data,
&codecpar->nb_coded_side_data, nb_coded_side_data,
AV_PKT_DATA_DOVI_CONF, cfg, cfg_size, 0)) { AV_PKT_DATA_DOVI_CONF, cfg, cfg_size, 0)) {
av_free(cfg); av_free(cfg);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -238,19 +246,22 @@ skip:
return 0; return 0;
} }
int ff_dovi_configure_from_codedpar(DOVIContext *s, AVCodecParameters *par,
const AVDOVIMetadata *metadata,
enum AVDOVICompression compression,
int strict_std_compliance)
{
return dovi_configure_ext(s, par->codec_id, metadata, compression,
strict_std_compliance, par->width, par->height,
par->framerate, par->format, par->color_space,
par->color_primaries, par->color_trc,
&par->coded_side_data, &par->nb_coded_side_data);
}
int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx) int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
{ {
int ret;
const AVFrameSideData *sd;
const AVDOVIMetadata *metadata = NULL; const AVDOVIMetadata *metadata = NULL;
AVCodecParameters *codecpar = avcodec_parameters_alloc(); const AVFrameSideData *sd;
if (!codecpar)
return AVERROR(ENOMEM);
ret = avcodec_parameters_from_context(codecpar, avctx);
if (ret < 0)
goto fail;
sd = av_frame_side_data_get(avctx->decoded_side_data, sd = av_frame_side_data_get(avctx->decoded_side_data,
avctx->nb_decoded_side_data, avctx->nb_decoded_side_data,
AV_FRAME_DATA_DOVI_METADATA); AV_FRAME_DATA_DOVI_METADATA);
@ -258,16 +269,11 @@ int ff_dovi_configure(DOVIContext *s, AVCodecContext *avctx)
metadata = (const AVDOVIMetadata *) sd->data; metadata = (const AVDOVIMetadata *) sd->data;
/* Current encoders cannot handle metadata compression during encoding */ /* Current encoders cannot handle metadata compression during encoding */
ret = ff_dovi_configure_ext(s, codecpar, metadata, AV_DOVI_COMPRESSION_NONE, return dovi_configure_ext(s, avctx->codec_id, metadata, AV_DOVI_COMPRESSION_NONE,
avctx->strict_std_compliance); avctx->strict_std_compliance, avctx->width,
if (ret < 0) avctx->height, avctx->framerate, avctx->pix_fmt,
goto fail; avctx->colorspace, avctx->color_primaries, avctx->color_trc,
&avctx->coded_side_data, &avctx->nb_coded_side_data);
ret = avcodec_parameters_to_context(avctx, codecpar);
fail:
avcodec_parameters_free(&codecpar);
return ret;
} }
/* Compares only the static DM metadata parts of AVDOVIColorMetadata (excluding /* Compares only the static DM metadata parts of AVDOVIColorMetadata (excluding