From 6bfc26830524ca1e5d7fd54e32ea0ffdbcdd25f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Sun, 21 Nov 2010 10:24:48 +0000 Subject: [PATCH] Add av_append_packet function, to be used in code that merges packets to allow palette handling without using PaletteControl. Originally committed as revision 25777 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avformat.h | 17 ++++++++++++++++- libavformat/utils.c | 15 +++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a9cf174af..517d1ac15 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 84 +#define LIBAVFORMAT_VERSION_MINOR 85 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -245,6 +245,21 @@ void av_metadata_free(AVMetadata **m); int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size); +/** + * Reads data and appends it to the current content of the AVPacket. + * If pkt->size is 0 it behaves like av_get_packet. + * Note that this uses av_grow_packet and thus involves a realloc + * which is inefficient. Thus this function should only be used + * when there is no reasonable way to know (an upper bound of) + * the final size. + * + * @param pkt packet + * @param size amount of data to read + * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data + * will not be lost even if an error occurs. + */ +int av_append_packet(ByteIOContext *s, AVPacket *pkt, int size); + /*************************************************/ /* fractional numbers for exact pts handling */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 937a615fc..066da547f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -339,6 +339,21 @@ int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size) return ret; } +int av_append_packet(ByteIOContext *s, AVPacket *pkt, int size) +{ + int ret; + int old_size; + if (!pkt->size) + return av_get_packet(s, pkt, size); + old_size = pkt->size; + ret = av_grow_packet(pkt, size); + if (ret < 0) + return ret; + ret = get_buffer(s, pkt->data + old_size, size); + av_shrink_packet(pkt, old_size + FFMAX(ret, 0)); + return ret; +} + int av_filename_number_test(const char *filename) { -- 2.11.0