From 2ef15b46e42647f6688d05abe2400fe008de5e0a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sun, 1 Apr 2012 10:47:39 +0200 Subject: avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics --- libavcodec/avpacket.c | 113 +++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 51 deletions(-) (limited to 'libavcodec/avpacket.c') diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 9b549e7190..5e2292de28 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -19,13 +19,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" #include "libavutil/avassert.h" - +#include "avcodec.h" void av_destruct_packet_nofree(AVPacket *pkt) { - pkt->data = NULL; pkt->size = 0; + pkt->data = NULL; + pkt->size = 0; pkt->side_data = NULL; pkt->side_data_elems = 0; } @@ -35,7 +35,8 @@ 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); @@ -45,40 +46,41 @@ void av_destruct_packet(AVPacket *pkt) 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; + pkt->destruct = 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) + 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){ + if (data) { memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); - }else - size=0; + } else + size = 0; av_init_packet(pkt); - pkt->data = data; - pkt->size = size; + pkt->data = data; + pkt->size = size; pkt->destruct = av_destruct_packet; - if(!data) + if (!data) return AVERROR(ENOMEM); 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); } @@ -89,40 +91,45 @@ int av_grow_packet(AVPacket *pkt, int grow_by) 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); + 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; + pkt->data = new_ptr; pkt->size += grow_by; memset(pkt->data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); 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 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) int av_dup_packet(AVPacket *pkt) { AVPacket tmp_pkt; - if (((pkt->destruct == av_destruct_packet_nofree) || (pkt->destruct == NULL)) && pkt->data) { + if (((pkt->destruct == av_destruct_packet_nofree) || + (pkt->destruct == NULL)) && pkt->data) { tmp_pkt = *pkt; pkt->data = NULL; @@ -135,14 +142,15 @@ int av_dup_packet(AVPacket *pkt) 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)); - for (i = 0; i < pkt->side_data_elems; i++) { + 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); - } } } return 0; + failed_alloc: av_destruct_packet(pkt); return AVERROR(ENOMEM); @@ -151,14 +159,16 @@ failed_alloc: void av_free_packet(AVPacket *pkt) { if (pkt) { - if (pkt->destruct) pkt->destruct(pkt); - pkt->data = NULL; pkt->size = 0; + if (pkt->destruct) + pkt->destruct(pkt); + pkt->data = NULL; + pkt->size = 0; pkt->side_data = NULL; 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; @@ -168,7 +178,8 @@ uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, 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; @@ -182,7 +193,7 @@ uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type, 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; -- cgit v1.2.3