utils: Add av_stream_add_side_data()

Functionally similar to av_packet_add_side_data(). Allows the use of an already allocated buffer as stream side data.

James Almer committed 9 years ago

Commit 79ff9931 parent 286ab874 files · +46 −11Browse files

Unified · Split

4 files

@@ -13,6 +13,9 @@ libavutil: 2015-08-28 · 12 unmodified lines
13		13
14	API changes, most recent first:	14	API changes, most recent first:
15		15
		16	2016-xx-xx - xxxxxxx - lavf 57.10.0 - avformat.h
		17	Add av_stream_add_side_data().
		18
16	2016-xx-xx - xxxxxxx - lavu 55.28.0 - pixfmt.h	19	2016-xx-xx - xxxxxxx - lavu 55.28.0 - pixfmt.h
17	Add AV_PIX_FMT_GRAY12(LE/BE).	20	Add AV_PIX_FMT_GRAY12(LE/BE).
18		21

@@ -1399,6 +1399,21 @@ const AVClass *avformat_get_class(void); · 1398 unmodified lines
1399	*/	1399	*/
1400	AVStream avformat_new_stream(AVFormatContext s, const AVCodec *c);	1400	AVStream avformat_new_stream(AVFormatContext s, const AVCodec *c);
1401		1401
		1402	/**
		1403	* Wrap an existing array as stream side data.
		1404	*
		1405	* @param st stream
		1406	* @param type side information type
		1407	* @param data the side data array. It must be allocated with the av_malloc()
		1408	* family of functions. The ownership of the data is transferred to
		1409	* st.
		1410	* @param size side information size
		1411	* @return zero on success, a negative AVERROR code on failure. On failure,
		1412	* the stream is unchanged and the data remains owned by the caller.
		1413	*/
		1414	int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
		1415	uint8_t *data, size_t size);
		1416
1402	/**	1417	/**
1403	* Allocate new information from stream.	1418	* Allocate new information from stream.
1404	*	1419	*

     return NULL;
 }
-uint8_t *av_stream_new_side_data(AVStream *st, enum AVPacketSideDataType type,
+int av_stream_add_side_data(AVStream *st, enum AVPacketSideDataType type,
-                                 int size)
+                            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];
             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 ((unsigned) st->nb_side_data + 1 >= INT_MAX / sizeof(*st->side_data))
+        return AVERROR(ERANGE);
+    tmp = av_realloc(st->side_data, (st->nb_side_data + 1) * sizeof(*tmp));
     if (!tmp) {
-        av_freep(&data);
+        return AVERROR(ENOMEM);
-        return NULL;
     }
     st->side_data = tmp;
     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;
 }

@@ -30,7 +30,7 @@ · 29 unmodified lines
30	#include "libavutil/version.h"	30	#include "libavutil/version.h"
31		31
32	#define LIBAVFORMAT_VERSION_MAJOR 57	32	#define LIBAVFORMAT_VERSION_MAJOR 57
33	#define LIBAVFORMAT_VERSION_MINOR 9	33	#define LIBAVFORMAT_VERSION_MINOR 10
34	#define LIBAVFORMAT_VERSION_MICRO 0	34	#define LIBAVFORMAT_VERSION_MICRO 0
35		35
36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \	36	#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

Keyboard shortcuts