diff mbox

[FFmpeg-devel,1/3] avformat/utils: add av_stream_add_side_data()

Message ID 20161117054115.3732-1-jamrial@gmail.com
State Accepted
Headers show

Commit Message

James Almer Nov. 17, 2016, 5:41 a.m. UTC 
Functionally similar to av_packet_add_side_data(). Allows the use of an
already allocated buffer as stream side data.

Signed-off-by: James Almer <jamrial@gmail.com>
---
TODO: Version bump.

 doc/APIchanges         |  3 +++
 libavformat/avformat.h | 16 ++++++++++++++++
 libavformat/utils.c    | 32 +++++++++++++++++++++++---------
 3 files changed, 42 insertions(+), 9 deletions(-)

Comments

Michael Niedermayer Nov. 19, 2016, 12:53 a.m. UTC | #1 
On Thu, Nov 17, 2016 at 02:41:13AM -0300, James Almer wrote:
> Functionally similar to av_packet_add_side_data(). Allows the use of an
> already allocated buffer as stream side data.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> TODO: Version bump.
> 
>  doc/APIchanges         |  3 +++
>  libavformat/avformat.h | 16 ++++++++++++++++
>  libavformat/utils.c    | 32 +++++++++++++++++++++++---------
>  3 files changed, 42 insertions(+), 9 deletions(-)

LGTM

thx

[...]
James Almer Nov. 19, 2016, 1:18 a.m. UTC | #2 
On 11/18/2016 9:53 PM, Michael Niedermayer wrote:
> On Thu, Nov 17, 2016 at 02:41:13AM -0300, James Almer wrote:
>> Functionally similar to av_packet_add_side_data(). Allows the use of an
>> already allocated buffer as stream side data.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>> TODO: Version bump.
>>
>>  doc/APIchanges         |  3 +++
>>  libavformat/avformat.h | 16 ++++++++++++++++
>>  libavformat/utils.c    | 32 +++++++++++++++++++++++---------
>>  3 files changed, 42 insertions(+), 9 deletions(-)
> 
> LGTM
> 
> thx

Pushed, thanks.
diff mbox

Patch

diff --git a/doc/APIchanges b/doc/APIchanges
index 3089c82..fc47d20 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@  libavutil:     2015-08-28
 
 API changes, most recent first:
 
+2016-11-xx - xxxxxxx - lavf 57.58.100 - avformat.h
+  Add av_stream_add_side_data().
+
 2016-xx-xx - xxxxxxx - lavu 55.39.100 - hwcontext_vaapi.h
   Add AV_VAAPI_DRIVER_QUIRK_ATTRIB_MEMTYPE.
 
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index f9f4d72..ce6d587 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -2049,6 +2049,22 @@  const AVClass *avformat_get_class(void);
 AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
 
 /**
+ * Wrap an existing array as stream side data.
+ *
+ * @param st stream
+ * @param type side information type
+ * @param data the side data array. It must be allocated with the av_malloc()
+ *             family of functions. The ownership of the data is transferred to
+ *             st.
+ * @param size side information size
+ * @return a non-negative number on success, a negative AVERROR code on
+ *         failure. On failure, the stream is unchanged and the data remains
+ *         owned by the caller.
+ */
+int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
+                            uint8_t *data, size_t size);
+
+/**
  * Allocate new information from stream.
  *
  * @param stream stream
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5664646..19bb8bd 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -5104,15 +5104,11 @@  uint8_t *av_stream_get_side_data(const AVStream *st,
     return NULL;
 }
 
-uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
-                                 int size)
+int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
+                            uint8_t *data, size_t size)
 {
     AVPacketSideData *sd, *tmp;
     int i;
-    uint8_t *data = av_malloc(size);
-
-    if (!data)
-        return NULL;
 
     for (i = 0; i < st->nb_side_data; i++) {
         sd = &st->side_data[i];
@@ -5121,14 +5117,13 @@  uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
             av_freep(&sd->data);
             sd->data = data;
             sd->size = size;
-            return sd->data;
+            return 0;
         }
     }
 
     tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp));
     if (!tmp) {
-        av_freep(&data);
-        return NULL;
+        return AVERROR(ENOMEM);
     }
 
     st->side_data = tmp;
@@ -5138,6 +5133,25 @@  uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
     sd->type = type;
     sd->data = data;
     sd->size = size;
+
+    return 0;
+}
+
+uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
+                                 int size)
+{
+    int ret;
+    uint8_t *data = av_malloc(size);
+
+    if (!data)
+        return NULL;
+
+    ret = av_stream_add_side_data(st, type, data, size);
+    if (ret < 0) {
+        av_freep(&data);
+        return NULL;
+    }
+
     return data;
 }