Quoting Jan Ekström (2024-02-29 17:42:53)
> @@ -872,6 +889,38 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData
> ***sd, int *nb_sd,
> return ret;
> }
>
> +int av_frame_side_data_from_sd(AVFrameSideData ***sd, int *nb_sd,
> + const AVFrameSideData *src,
> + unsigned int flags)
> +{
> + if (!sd || !src || !nb_sd || (*nb_sd && !*sd))
> + return AVERROR(EINVAL);
Overzealous checking is evil. This should be removed, or made into an
assert.
> +
> + {
These extra blocks are ugly.
> + AVBufferRef *buf = av_buffer_ref(src->buf);
> + AVFrameSideData *sd_dst = NULL;
> +
> + if (flags & AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES)
> + remove_side_data(sd, nb_sd, src->type);
> +
> + sd_dst = add_side_data_to_set_from_buf(sd, nb_sd, src->type, buf);
> + if (!sd_dst) {
> + av_buffer_unref(&buf);
> + return AVERROR(ENOMEM);
> + }
> +
> + {
> + int ret = av_dict_copy(&sd_dst->metadata, src->metadata, 0);
> + if (ret < 0) {
> + remove_side_data_by_entry(sd, nb_sd, sd_dst);
Removing by the pointer is ugly. You could either
* assume add_side_data_to_set_from_buf() adds to the end and remove the
last element
* have add_side_data_to_set_from_buf() return the index of the added
element
> + return ret;
> + }
> + }
> +
> + return 0;
> + }
> +}
> +
> AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
> enum AVFrameSideDataType type)
> {
> diff --git a/libavutil/frame.h b/libavutil/frame.h
> index 726ca19a03..47d0096bc4 100644
> --- a/libavutil/frame.h
> +++ b/libavutil/frame.h
> @@ -1081,6 +1081,25 @@ AVFrameSideData
> *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd,
> enum AVFrameSideDataType type,
> size_t size, unsigned int flags);
>
> +/**
> + * Add a new side data entry to a set based on existing side data, taking
> + * a reference towards the contained AVBufferRef.
> + *
> + * @param sd pointer to array of side data to which to add another entry.
> + * @param nb_sd pointer to an integer containing the number of entries in
> + * the array.
> + * @param src side data which should be added to the set
> + * @param flags Some combination of AV_FRAME_SIDE_DATA_SET_FLAG_* flags, or
> 0.
> + *
> + * @return negative error code on failure, >=0 on success. In case of
> + * AV_FRAME_SIDE_DATA_SET_FLAG_NO_DUPLICATES being set, entries
> + * of matching AVFrameSideDataType will be removed before the
> + * addition is attempted.
> + */
> +int av_frame_side_data_from_sd(AVFrameSideData ***sd, int *nb_sd,
av_frame_side_data_clone()?
av_frame_side_data_ref()?
--
Anton Khirnov
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
