Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'

* commit '31c51f7441de07b88cfea2550245bf1f5140cb8f': avpacket: add a function for wrapping existing data as side data

Hendrik Leppkes committed 10 years ago

Commit 30833d12 parents 10e55bd 31c51f74 files · +48 −11Browse files

Unified · Split

4 files

doc/APIchanges +3 −0
libavcodec/avcodec.h +16 −0
libavcodec/avpacket.c +28 −10
libavcodec/version.h +1 −1

@@ -14,6 +14,9 @@ libavutil: 2015-08-28 · 13 unmodified lines
14		14
15		15
16	API changes, most recent first:	16	API changes, most recent first:
		17	2015-12-17 - xxxxxxx - lavc 57.18.100 / 57.11.0 - avcodec.h
		18	Add av_packet_add_side_data().
		19
17	2015-12-11 - xxxxxxx - lavf 57.20.100 - avformat.h	20	2015-12-11 - xxxxxxx - lavf 57.20.100 - avformat.h
18	Add av_program_add_stream_index()	21	Add av_program_add_stream_index()
19		22

libavcodec/avcodec.h+16−0

@@ -3996,6 +3996,22 @@ void av_free_packet(AVPacket *pkt); · 3995 unmodified lines
3996	uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,	3996	uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
3997	int size);	3997	int size);
3998		3998
		3999	/**
		4000	* Wrap an existing array as a packet side data.
		4001	*
		4002	* @param pkt packet
		4003	* @param type side information type
		4004	* @param data the side data array. It must be allocated with the av_malloc()
		4005	* family of functions. The ownership of the data is transferred to
		4006	* pkt.
		4007	* @param size side information size
		4008	* @return a non-negative number on success, a negative AVERROR code on
		4009	* failure. On failure, the packet is unchanged and the data remains
		4010	* owned by the caller.
		4011	*/
		4012	int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
		4013	uint8_t *data, size_t size);
		4014
3999	/**	4015	/**
4000	* Shrink the already allocated side data buffer	4016	* Shrink the already allocated side data buffer
4001	*	4017	*

libavcodec/avpacket.c+28−10

 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
-uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+int av_packet_add_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
-                                 int size)
+                            uint8_t *data, size_t size)
 {
     int elems = pkt->side_data_elems;
     if ((unsigned)elems + 1 > INT_MAX / sizeof(*pkt->side_data))
-        return NULL;
+        return AVERROR(EOVERFLOW);
-    if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
-        return NULL;
     pkt->side_data = av_realloc(pkt->side_data,
                                 (elems + 1) * sizeof(*pkt->side_data));
     if (!pkt->side_data)
-        return NULL;
+        return AVERROR(ENOMEM);
-    pkt->side_data[elems].data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+    pkt->side_data[elems].data = data;
-    if (!pkt->side_data[elems].data)
-        return NULL;
     pkt->side_data[elems].size = size;
     pkt->side_data[elems].type = type;
     pkt->side_data_elems++;
-    return pkt->side_data[elems].data;
+    return 0;
+}
+uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+                                 int size)
+{
+    int ret;
+    uint8_t *data;
+    if ((unsigned)size > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE)
+        return NULL;
+    data = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE);
+    if (!data)
+        return NULL;
+    ret = av_packet_add_side_data(pkt, type, data, size);
+    if (ret < 0) {
+        av_freep(&data);
+        return NULL;
+    }
+    return data;
 }
 uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,

libavcodec/version.h+1−1

@@ -29,7 +29,7 @@ · 28 unmodified lines
29	#include "libavutil/version.h"	29	#include "libavutil/version.h"
30		30
31	#define LIBAVCODEC_VERSION_MAJOR 57	31	#define LIBAVCODEC_VERSION_MAJOR 57
32	#define LIBAVCODEC_VERSION_MINOR 17	32	#define LIBAVCODEC_VERSION_MINOR 18
33	#define LIBAVCODEC_VERSION_MICRO 100	33	#define LIBAVCODEC_VERSION_MICRO 100
34		34
35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \	35	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code