diff mbox series

[FFmpeg-devel,2/3] lavc/videotoolbox: expose routine to set CVPixelBufferRef metadata

Message ID 20211218110953.30751-2-rcombs@rcombs.me
State New
Headers show
Series [FFmpeg-devel,1/3] lavu/videotoolbox: expose conversion routines for color parameters | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Ridley Combs Dec. 18, 2021, 11:09 a.m. UTC 
---
 doc/APIchanges                     | 3 +++
 libavutil/hwcontext_videotoolbox.c | 6 ++++++
 libavutil/hwcontext_videotoolbox.h | 7 +++++++
 libavutil/version.h                | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/doc/APIchanges b/doc/APIchanges
index af2fbaafcf..c7b5591f6a 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,9 @@  libavutil:     2021-04-27
 
 API changes, most recent first:
 
+2021-12-xx - xxxxxxxxxx - lavu 57.12.100 - hwcontext_videotoolbox.h
+  Add av_vt_pixbuf_set_attachments
+
 2021-12-xx - xxxxxxxxxx - lavu 57.12.100 - hwcontext_videotoolbox.h
   Add av_map_videotoolbox_chroma_loc_from_av
   Add av_map_videotoolbox_color_matrix_from_av
diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c
index 4c6d37304c..2d42ff6f4c 100644
--- a/libavutil/hwcontext_videotoolbox.c
+++ b/libavutil/hwcontext_videotoolbox.c
@@ -571,6 +571,12 @@  static int vt_pixbuf_set_attachments(void *log_ctx,
     return 0;
 }
 
+int av_vt_pixbuf_set_attachments(void *log_ctx,
+                                 CVPixelBufferRef pixbuf, const AVFrame *src)
+{
+    return vt_pixbuf_set_attachments(log_ctx, pixbuf, src);
+}
+
 static int vt_map_frame(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src,
                         int flags)
 {
diff --git a/libavutil/hwcontext_videotoolbox.h b/libavutil/hwcontext_videotoolbox.h
index 916899e97d..b6bdcf243d 100644
--- a/libavutil/hwcontext_videotoolbox.h
+++ b/libavutil/hwcontext_videotoolbox.h
@@ -85,4 +85,11 @@  CFStringRef av_map_videotoolbox_color_primaries_from_av(enum AVColorPrimaries pr
  */
 CFStringRef av_map_videotoolbox_color_trc_from_av(enum AVColorTransferCharacteristic trc);
 
+/**
+ * Update a CVPixelBufferRef's metadata to based on an AVFrame.
+ * Returns 0 if no known equivalent was found.
+ */
+int av_vt_pixbuf_set_attachments(void *log_ctx,
+                                 CVPixelBufferRef pixbuf, const struct AVFrame *src);
+
 #endif /* AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H */
diff --git a/libavutil/version.h b/libavutil/version.h
index 0e7b36865a..668f9206fe 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@ 
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  57
-#define LIBAVUTIL_VERSION_MINOR  11
+#define LIBAVUTIL_VERSION_MINOR  12
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \