[FFmpeg-devel] [PATCH v6 07/13] avutil/frame: add helper for getting side data from array

[Jan Ekström]

---
 libavutil/frame.c | 20 +++++++++++++++-----
 libavutil/frame.h | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/libavutil/frame.c b/libavutil/frame.c
index 99c9ce4119..e7679bf34d 100644
--- a/libavutil/frame.c
+++ b/libavutil/frame.c
@@ -921,16 +921,26 @@ int av_frame_side_data_from_sd(AVFrameSideData ***sd, int *nb_sd,
     }
 }
 
-AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
-                                        enum AVFrameSideDataType type)
+const AVFrameSideData *av_frame_side_data_get(const AVFrameSideData **sd,
+                                              const int nb_sd,
+                                              enum AVFrameSideDataType type)
 {
-    for (int i = 0; i < frame->nb_side_data; i++) {
-        if (frame->side_data[i]->type == type)
-            return frame->side_data[i];
+    for (int i = 0; i < nb_sd; i++) {
+        if (sd[i]->type == type)
+            return sd[i];
     }
     return NULL;
 }
 
+AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
+                                        enum AVFrameSideDataType type)
+{
+    return (AVFrameSideData *)av_frame_side_data_get(
+        (const AVFrameSideData **)frame->side_data, frame->nb_side_data,
+        type
+    );
+}
+
 static int frame_copy_video(AVFrame *dst, const AVFrame *src)
 {
     int planes;
diff --git a/libavutil/frame.h b/libavutil/frame.h
index 47d0096bc4..751f7a67d6 100644
--- a/libavutil/frame.h
+++ b/libavutil/frame.h
@@ -1100,6 +1100,20 @@ int av_frame_side_data_from_sd(AVFrameSideData ***sd, int *nb_sd,
                                const AVFrameSideData *src,
                                unsigned int flags);
 
+/**
+ * Get a side data entry of a specific type from a set.
+ *
+ * @param sd    array of side data.
+ * @param nb_sd integer containing the number of entries in the array.
+ * @param type  type of side data to be queried
+ *
+ * @return a pointer to the side data of a given type on success, NULL if there
+ *         is no side data with such type in this set.
+ */
+const AVFrameSideData *av_frame_side_data_get(const AVFrameSideData **sd,
+                                              const int nb_sd,
+                                              enum AVFrameSideDataType type);
+
 /**
  * @}
  */
-- 
2.43.2