highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/pngdec: respect side data preference

Browse Source
This commit is contained in:
Niklas Haas
2024-02-17 21:53:00 +01:00
committed by Anton Khirnov
parent ffb8dc7be6
commit 454691a2ec
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/pngdec.c
View File

@@ -660,6 +660,7 @@ static int decode_phys_chunk(AVCodecContext *avctx, PNGDecContext *s,
static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame) static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame)
{ {
PNGDecContext *s = avctx->priv_data; PNGDecContext *s = avctx->priv_data;
int ret;
if (s->have_cicp) { if (s->have_cicp) {
if (s->cicp_primaries >= AVCOL_PRI_NB) if (s->cicp_primaries >= AVCOL_PRI_NB)
@@ -678,11 +679,15 @@ static int populate_avctx_color_fields(AVCodecContext *avctx, AVFrame *frame)
avctx->color_range = frame->color_range = AVCOL_RANGE_UNSPECIFIED; avctx->color_range = frame->color_range = AVCOL_RANGE_UNSPECIFIED;
} }
} else if (s->iccp_data) { } else if (s->iccp_data) {
AVFrameSideData *sd = av_frame_new_side_data(frame, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); AVFrameSideData *sd;
if (!sd) ret = ff_frame_new_side_data(avctx, frame, AV_FRAME_DATA_ICC_PROFILE,
return AVERROR(ENOMEM); s->iccp_data_len, &sd);
memcpy(sd->data, s->iccp_data, s->iccp_data_len); if (ret < 0)
av_dict_set(&sd->metadata, "name", s->iccp_name, 0); return ret;
if (sd) {
memcpy(sd->data, s->iccp_data, s->iccp_data_len);
av_dict_set(&sd->metadata, "name", s->iccp_name, 0);
}
} else if (s->have_srgb) { } else if (s->have_srgb) {
avctx->color_primaries = frame->color_primaries = AVCOL_PRI_BT709; avctx->color_primaries = frame->color_primaries = AVCOL_PRI_BT709;
avctx->color_trc = frame->color_trc = AVCOL_TRC_IEC61966_2_1; avctx->color_trc = frame->color_trc = AVCOL_TRC_IEC61966_2_1;