[FFmpeg-cvslog] avutil/frame: add av_frame_replace
James Almer
git at videolan.org
Thu May 18 17:00:15 EEST 2023
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Aug 10 18:59:59 2021 -0300| [01d444c077e562fc5b8f47f9c0c5257f8fe376bb] | committer: James Almer
avutil/frame: add av_frame_replace
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01d444c077e562fc5b8f47f9c0c5257f8fe376bb
---
doc/APIchanges | 3 ++
libavutil/frame.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++
libavutil/frame.h | 13 ++++++
libavutil/version.h | 2 +-
4 files changed, 142 insertions(+), 1 deletion(-)
diff --git a/doc/APIchanges b/doc/APIchanges
index 770d6ffc5e..130955ef02 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09
API changes, most recent first:
+2023-05-xx - xxxxxxxxxx - lavu 58.8.100 - frame.h
+ Add av_frame_replace().
+
2023-05-xx - xxxxxxxxxx - lavu 58 - frame.h
Deprecate AVFrame.palette_has_changed without replacement.
diff --git a/libavutil/frame.c b/libavutil/frame.c
index b0d8eebdde..4a0647cc60 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -479,6 +479,131 @@ fail:
return ret;
}
+int av_frame_replace(AVFrame *dst, const AVFrame *src)
+{
+ int ret = 0;
+
+ if (dst == src)
+ return AVERROR(EINVAL);
+
+ if (!src->buf[0]) {
+ av_frame_unref(dst);
+
+ /* duplicate the frame data if it's not refcounted */
+ if ( src->data[0] || src->data[1]
+ || src->data[2] || src->data[3])
+ return av_frame_ref(dst, src);
+
+ return av_frame_copy_props(dst, src);
+ }
+
+ dst->format = src->format;
+ dst->width = src->width;
+ dst->height = src->height;
+ dst->nb_samples = src->nb_samples;
+#if FF_API_OLD_CHANNEL_LAYOUT
+FF_DISABLE_DEPRECATION_WARNINGS
+ dst->channels = src->channels;
+ dst->channel_layout = src->channel_layout;
+ if (!av_channel_layout_check(&src->ch_layout)) {
+ av_channel_layout_uninit(&dst->ch_layout);
+ if (src->channel_layout)
+ av_channel_layout_from_mask(&dst->ch_layout, src->channel_layout);
+ else {
+ dst->ch_layout.nb_channels = src->channels;
+ dst->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+ }
+ } else {
+#endif
+ ret = av_channel_layout_copy(&dst->ch_layout, &src->ch_layout);
+ if (ret < 0)
+ goto fail;
+#if FF_API_OLD_CHANNEL_LAYOUT
+ }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
+ wipe_side_data(dst);
+ av_dict_free(&dst->metadata);
+ ret = frame_copy_props(dst, src, 0);
+ if (ret < 0)
+ goto fail;
+
+ /* replace the buffers */
+ for (int i = 0; i < FF_ARRAY_ELEMS(src->buf); i++) {
+ ret = av_buffer_replace(&dst->buf[i], src->buf[i]);
+ if (ret < 0)
+ goto fail;
+ }
+
+ if (src->extended_buf) {
+ if (dst->nb_extended_buf != src->nb_extended_buf) {
+ int nb_extended_buf = FFMIN(dst->nb_extended_buf, src->nb_extended_buf);
+ void *tmp;
+
+ for (int i = nb_extended_buf; i < dst->nb_extended_buf; i++)
+ av_buffer_unref(&dst->extended_buf[i]);
+
+ tmp = av_realloc_array(dst->extended_buf, sizeof(*dst->extended_buf),
+ src->nb_extended_buf);
+ if (!tmp) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ dst->extended_buf = tmp;
+ dst->nb_extended_buf = src->nb_extended_buf;
+
+ memset(&dst->extended_buf[nb_extended_buf], 0,
+ (src->nb_extended_buf - nb_extended_buf) * sizeof(*dst->extended_buf));
+ }
+
+ for (int i = 0; i < src->nb_extended_buf; i++) {
+ ret = av_buffer_replace(&dst->extended_buf[i], src->extended_buf[i]);
+ if (ret < 0)
+ goto fail;
+ }
+ } else if (dst->extended_buf) {
+ for (int i = 0; i < dst->nb_extended_buf; i++)
+ av_buffer_unref(&dst->extended_buf[i]);
+ av_freep(&dst->extended_buf);
+ }
+
+ ret = av_buffer_replace(&dst->hw_frames_ctx, src->hw_frames_ctx);
+ if (ret < 0)
+ goto fail;
+
+ if (dst->extended_data != dst->data)
+ av_freep(&dst->extended_data);
+
+ if (src->extended_data != src->data) {
+ int ch = dst->ch_layout.nb_channels;
+
+ if (!ch) {
+ ret = AVERROR(EINVAL);
+ goto fail;
+ }
+
+ if (ch > SIZE_MAX / sizeof(*dst->extended_data))
+ goto fail;
+
+ dst->extended_data = av_memdup(src->extended_data, sizeof(*dst->extended_data) * ch);
+ if (!dst->extended_data) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
+ } else
+ dst->extended_data = dst->data;
+
+ memcpy(dst->data, src->data, sizeof(src->data));
+ memcpy(dst->linesize, src->linesize, sizeof(src->linesize));
+
+ return 0;
+
+fail:
+ av_frame_unref(dst);
+ return ret;
+}
+
AVFrame *av_frame_clone(const AVFrame *src)
{
AVFrame *ret = av_frame_alloc();
diff --git a/libavutil/frame.h b/libavutil/frame.h
index bb634008ea..a491315f25 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -836,6 +836,19 @@ void av_frame_free(AVFrame **frame);
*/
int av_frame_ref(AVFrame *dst, const AVFrame *src);
+/**
+ * Ensure the destination frame refers to the same data described by the source
+ * frame, either by creating a new reference for each AVBufferRef from src if
+ * they differ from those in dst, by allocating new buffers and copying data if
+ * src is not reference counted, or by unrefencing it if src is empty.
+ *
+ * Frame properties on dst will be replaced by those from src.
+ *
+ * @return 0 on success, a negative AVERROR on error. On error, dst is
+ * unreferenced.
+ */
+int av_frame_replace(AVFrame *dst, const AVFrame *src);
+
/**
* Create a new frame that references the same data as src.
*
diff --git a/libavutil/version.h b/libavutil/version.h
index c41c6afeac..177effa9a4 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 58
-#define LIBAVUTIL_VERSION_MINOR 7
+#define LIBAVUTIL_VERSION_MINOR 8
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list