* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avcodec.h"
-#include "libavutil/avassert.h"
-
+#include <string.h>
-void av_destruct_packet_nofree(AVPacket *pkt)
-{
- pkt->data = NULL; pkt->size = 0;
- pkt->side_data = NULL;
- pkt->side_data_elems = 0;
-}
+#include "libavutil/avassert.h"
+#include "libavutil/common.h"
+#include "libavutil/mem.h"
+#include "avcodec.h"
+#if FF_API_DESTRUCT_PACKET
void av_destruct_packet(AVPacket *pkt)
{
- int i;
-
av_free(pkt->data);
- pkt->data = NULL; pkt->size = 0;
+ pkt->data = NULL;
+ pkt->size = 0;
+}
- for (i = 0; i < pkt->side_data_elems; i++)
- av_free(pkt->side_data[i].data);
- av_freep(&pkt->side_data);
- pkt->side_data_elems = 0;
+/* a dummy destruct callback for the callers that assume AVPacket.destruct ==
+ * NULL => static data */
+static void dummy_destruct_packet(AVPacket *pkt)
+{
+ av_assert0(0);
}
+#endif
void av_init_packet(AVPacket *pkt)
{
- pkt->pts = AV_NOPTS_VALUE;
- pkt->dts = AV_NOPTS_VALUE;
- pkt->pos = -1;
- pkt->duration = 0;
+ pkt->pts = AV_NOPTS_VALUE;
+ pkt->dts = AV_NOPTS_VALUE;
+ pkt->pos = -1;
+ pkt->duration = 0;
pkt->convergence_duration = 0;
- pkt->flags = 0;
- pkt->stream_index = 0;
- pkt->destruct= NULL;
- pkt->side_data = NULL;
- pkt->side_data_elems = 0;
+ pkt->flags = 0;
+ pkt->stream_index = 0;
+#if FF_API_DESTRUCT_PACKET
+ pkt->destruct = NULL;
+#endif
+ pkt->buf = NULL;
+ pkt->side_data = NULL;
+ pkt->side_data_elems = 0;
}
int av_new_packet(AVPacket *pkt, int size)
{
- uint8_t *data= NULL;
- if((unsigned)size < (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE)
- data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (data){
- memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
- }else
- size=0;
+ AVBufferRef *buf = NULL;
- av_init_packet(pkt);
- pkt->data = data;
- pkt->size = size;
- pkt->destruct = av_destruct_packet;
- if(!data)
+ if ((unsigned)size >= (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE)
+ return AVERROR(EINVAL);
+
+ av_buffer_realloc(&buf, size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!buf)
return AVERROR(ENOMEM);
+
+ memset(buf->data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+ av_init_packet(pkt);
+ pkt->buf = buf;
+ pkt->data = buf->data;
+ pkt->size = size;
+#if FF_API_DESTRUCT_PACKET
+ pkt->destruct = dummy_destruct_packet;
+#endif
+
return 0;
}
void av_shrink_packet(AVPacket *pkt, int size)
{
- if (pkt->size <= size) return;
+ if (pkt->size <= size)
+ return;
pkt->size = size;
memset(pkt->data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
}
int av_grow_packet(AVPacket *pkt, int grow_by)
{
- void *new_ptr;
+ int new_size;
av_assert0((unsigned)pkt->size <= INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE);
if (!pkt->size)
return av_new_packet(pkt, grow_by);
- if ((unsigned)grow_by > INT_MAX - (pkt->size + FF_INPUT_BUFFER_PADDING_SIZE))
+ if ((unsigned)grow_by >
+ INT_MAX - (pkt->size + FF_INPUT_BUFFER_PADDING_SIZE))
return -1;
- new_ptr = av_realloc(pkt->data, pkt->size + grow_by + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!new_ptr)
- return AVERROR(ENOMEM);
- pkt->data = new_ptr;
+
+ new_size = pkt->size + grow_by + FF_INPUT_BUFFER_PADDING_SIZE;
+ if (pkt->buf) {
+ int ret = av_buffer_realloc(&pkt->buf, new_size);
+ if (ret < 0)
+ return ret;
+ } else {
+ pkt->buf = av_buffer_alloc(new_size);
+ if (!pkt->buf)
+ return AVERROR(ENOMEM);
+ memcpy(pkt->buf->data, pkt->data, FFMIN(pkt->size, pkt->size + grow_by));
+#if FF_API_DESTRUCT_PACKET
+ pkt->destruct = dummy_destruct_packet;
+#endif
+ }
+ pkt->data = pkt->buf->data;
pkt->size += grow_by;
memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+ return 0;
+}
+
+int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size)
+{
+ if (size >= INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE)
+ return AVERROR(EINVAL);
+
+ pkt->buf = av_buffer_create(data, size + FF_INPUT_BUFFER_PADDING_SIZE,
+ av_buffer_default_free, NULL, 0);
+ if (!pkt->buf)
+ return AVERROR(ENOMEM);
+
+ pkt->data = data;
+ pkt->size = size;
+#if FF_API_DESTRUCT_PACKET
+ pkt->destruct = dummy_destruct_packet;
+#endif
+
return 0;
}
-#define DUP_DATA(dst, src, size, padding) \
- do { \
- void *data; \
- if (padding) { \
- if ((unsigned)(size) > (unsigned)(size) + FF_INPUT_BUFFER_PADDING_SIZE) \
- goto failed_alloc; \
- data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); \
- } else { \
- data = av_malloc(size); \
- } \
- if (!data) \
- goto failed_alloc; \
- memcpy(data, src, size); \
- if (padding) \
- memset((uint8_t*)data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); \
- dst = data; \
- } while(0)
+#define ALLOC_MALLOC(data, size) data = av_malloc(size)
+#define ALLOC_BUF(data, size) \
+do { \
+ av_buffer_realloc(&pkt->buf, size); \
+ data = pkt->buf ? pkt->buf->data : NULL; \
+} while (0)
+
+#define DUP_DATA(dst, src, size, padding, ALLOC) \
+ do { \
+ void *data; \
+ if (padding) { \
+ if ((unsigned)(size) > \
+ (unsigned)(size) + FF_INPUT_BUFFER_PADDING_SIZE) \
+ goto failed_alloc; \
+ ALLOC(data, size + FF_INPUT_BUFFER_PADDING_SIZE); \
+ } else { \
+ ALLOC(data, size); \
+ } \
+ if (!data) \
+ goto failed_alloc; \
+ memcpy(data, src, size); \
+ if (padding) \
+ memset((uint8_t *)data + size, 0, \
+ FF_INPUT_BUFFER_PADDING_SIZE); \
+ dst = data; \
+ } while (0)
int av_dup_packet(AVPacket *pkt)
{
AVPacket tmp_pkt;
- if (((pkt->destruct == av_destruct_packet_nofree) || (pkt->destruct == NULL)) && pkt->data) {
+ if (!pkt->buf && pkt->data
+#if FF_API_DESTRUCT_PACKET
+ && !pkt->destruct
+#endif
+ ) {
tmp_pkt = *pkt;
pkt->data = NULL;
pkt->side_data = NULL;
- DUP_DATA(pkt->data, tmp_pkt.data, pkt->size, 1);
- pkt->destruct = av_destruct_packet;
+ DUP_DATA(pkt->data, tmp_pkt.data, pkt->size, 1, ALLOC_BUF);
+#if FF_API_DESTRUCT_PACKET
+ pkt->destruct = dummy_destruct_packet;
+#endif
if (pkt->side_data_elems) {
int i;
DUP_DATA(pkt->side_data, tmp_pkt.side_data,
- pkt->side_data_elems * sizeof(*pkt->side_data), 0);
- memset(pkt->side_data, 0, pkt->side_data_elems * sizeof(*pkt->side_data));
+ pkt->side_data_elems * sizeof(*pkt->side_data), 0, ALLOC_MALLOC);
+ memset(pkt->side_data, 0,
+ pkt->side_data_elems * sizeof(*pkt->side_data));
for (i = 0; i < pkt->side_data_elems; i++) {
DUP_DATA(pkt->side_data[i].data, tmp_pkt.side_data[i].data,
- pkt->side_data[i].size, 1);
+ tmp_pkt.side_data[i].size, 1, ALLOC_MALLOC);
+ pkt->side_data[i].size = tmp_pkt.side_data[i].size;
+ pkt->side_data[i].type = tmp_pkt.side_data[i].type;
}
}
}
return 0;
+
failed_alloc:
- av_destruct_packet(pkt);
+ av_free_packet(pkt);
return AVERROR(ENOMEM);
}
void av_free_packet(AVPacket *pkt)
{
if (pkt) {
- if (pkt->destruct) pkt->destruct(pkt);
- pkt->data = NULL; pkt->size = 0;
- pkt->side_data = NULL;
+ int i;
+
+ if (pkt->buf)
+ av_buffer_unref(&pkt->buf);
+#if FF_API_DESTRUCT_PACKET
+ else if (pkt->destruct)
+ pkt->destruct(pkt);
+ pkt->destruct = NULL;
+#endif
+ pkt->data = NULL;
+ pkt->size = 0;
+
+ for (i = 0; i < pkt->side_data_elems; i++)
+ av_free(pkt->side_data[i].data);
+ av_freep(&pkt->side_data);
pkt->side_data_elems = 0;
}
}
-uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+uint8_t *av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
int size)
{
int elems = pkt->side_data_elems;
if ((unsigned)size > INT_MAX - FF_INPUT_BUFFER_PADDING_SIZE)
return NULL;
- pkt->side_data = av_realloc(pkt->side_data, (elems + 1) * sizeof(*pkt->side_data));
+ pkt->side_data = av_realloc(pkt->side_data,
+ (elems + 1) * sizeof(*pkt->side_data));
if (!pkt->side_data)
return NULL;
return pkt->side_data[elems].data;
}
-uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
+uint8_t *av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
int *size)
{
int i;
projects / ffmpeg / blobdiff