virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avutil/hwcontext_videotoolbox: Unset undefined values

Browse Source 
When mapping AVFrame properties to the CVBuffer attachments, it is
necessary to properly delete undefined attachments, else we can
leave incorrect values in there guessed from VideoToolbox for
example, leading to inconsistent results where the AVFrame and
CVBuffer differ in metadata.

Ref #10884

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Marvin Scholz 2024-05-20 03:12:01 +02:00 committed by Zhao Zhili
parent 03c2e9d77e
commit 1fa7554bd6
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
libavutil/hwcontext_videotoolbox.c
View File

@ -342,8 +342,10 @@ static int vt_pixbuf_set_par(void *log_ctx,
CFNumberRef num = NULL, den = NULL;
AVRational avpar = src->sample_aspect_ratio;
if (avpar.num == 0)
if (avpar.num == 0) {
CVBufferRemoveAttachment(pixbuf, kCVImageBufferPixelAspectRatioKey);
return 0;
}
av_reduce(&avpar.num, &avpar.den,
avpar.num, avpar.den,
@ -423,7 +425,10 @@ static int vt_pixbuf_set_chromaloc(void *log_ctx,
kCVImageBufferChromaLocationTopFieldKey,
loc,
kCVAttachmentMode_ShouldPropagate);
}
} else
CVBufferRemoveAttachment(
pixbuf,
kCVImageBufferChromaLocationTopFieldKey);
return 0;
}
@ -534,52 +539,53 @@ static int vt_pixbuf_set_colorspace(void *log_ctx,
Float32 gamma = 0;
colormatrix = av_map_videotoolbox_color_matrix_from_av(src->colorspace);
if (!colormatrix && src->colorspace != AVCOL_SPC_UNSPECIFIED)
av_log(log_ctx, AV_LOG_WARNING, "Color space %s is not supported.\n", av_color_space_name(src->colorspace));
if (colormatrix)
CVBufferSetAttachment(pixbuf, kCVImageBufferYCbCrMatrixKey,
colormatrix, kCVAttachmentMode_ShouldPropagate);
else {
CVBufferRemoveAttachment(pixbuf, kCVImageBufferYCbCrMatrixKey);
if (src->colorspace != AVCOL_SPC_UNSPECIFIED)
av_log(log_ctx, AV_LOG_WARNING,
"Color space %s is not supported.\n",
av_color_space_name(src->colorspace));
}
colorpri = av_map_videotoolbox_color_primaries_from_av(src->color_primaries);
if (!colorpri && src->color_primaries != AVCOL_PRI_UNSPECIFIED)
av_log(log_ctx, AV_LOG_WARNING, "Color primaries %s is not supported.\n", av_color_primaries_name(src->color_primaries));
if (colorpri)
CVBufferSetAttachment(pixbuf, kCVImageBufferColorPrimariesKey,
colorpri, kCVAttachmentMode_ShouldPropagate);
else {
CVBufferRemoveAttachment(pixbuf, kCVImageBufferColorPrimariesKey);
if (src->color_primaries != AVCOL_SPC_UNSPECIFIED)
av_log(log_ctx, AV_LOG_WARNING,
"Color primaries %s is not supported.\n",
av_color_primaries_name(src->color_primaries));
}
colortrc = av_map_videotoolbox_color_trc_from_av(src->color_trc);
if (!colortrc && src->color_trc != AVCOL_TRC_UNSPECIFIED)
av_log(log_ctx, AV_LOG_WARNING, "Color transfer function %s is not supported.\n", av_color_transfer_name(src->color_trc));
if (colortrc)
CVBufferSetAttachment(pixbuf, kCVImageBufferTransferFunctionKey,
colorpri, kCVAttachmentMode_ShouldPropagate);
else {
CVBufferRemoveAttachment(pixbuf, kCVImageBufferTransferFunctionKey);
if (src->color_trc != AVCOL_TRC_UNSPECIFIED)
av_log(log_ctx, AV_LOG_WARNING,
"Color transfer function %s is not supported.\n",
av_color_transfer_name(src->color_trc));
}
if (src->color_trc == AVCOL_TRC_GAMMA22)
gamma = 2.2;
else if (src->color_trc == AVCOL_TRC_GAMMA28)
gamma = 2.8;
if (colormatrix) {
CVBufferSetAttachment(
pixbuf,
kCVImageBufferYCbCrMatrixKey,
colormatrix,
kCVAttachmentMode_ShouldPropagate);
}
if (colorpri) {
CVBufferSetAttachment(
pixbuf,
kCVImageBufferColorPrimariesKey,
colorpri,
kCVAttachmentMode_ShouldPropagate);
}
if (colortrc) {
CVBufferSetAttachment(
pixbuf,
kCVImageBufferTransferFunctionKey,
colortrc,
kCVAttachmentMode_ShouldPropagate);
}
if (gamma != 0) {
CFNumberRef gamma_level = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma);
CVBufferSetAttachment(
pixbuf,
kCVImageBufferGammaLevelKey,
gamma_level,
kCVAttachmentMode_ShouldPropagate);
CVBufferSetAttachment(pixbuf, kCVImageBufferGammaLevelKey,
gamma_level, kCVAttachmentMode_ShouldPropagate);
CFRelease(gamma_level);
}
} else
CVBufferRemoveAttachment(pixbuf, kCVImageBufferGammaLevelKey);
return 0;
}