Mercurial > libavformat.hg
changeset 5069:9fd4808c3916 libavformat
limit raw packet buffer size used for codec probing
| author | bcoudurier |
|---|---|
| date | Thu, 25 Jun 2009 18:48:57 +0000 |
| parents | 5657f855d5d0 |
| children | 11e86c7bdc25 |
| files | avformat.h utils.c |
| diffstat | 2 files changed, 19 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/avformat.h Thu Jun 25 00:17:47 2009 +0000 +++ b/avformat.h Thu Jun 25 18:48:57 2009 +0000 @@ -22,8 +22,8 @@ #define AVFORMAT_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 34 -#define LIBAVFORMAT_VERSION_MICRO 1 +#define LIBAVFORMAT_VERSION_MINOR 35 +#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ @@ -638,6 +638,13 @@ struct AVPacketList *packet_buffer_end; AVMetadata *metadata; + + /** + * Remaining size available for raw_packet_buffer, in bytes. + * NOT PART OF PUBLIC API + */ +#define RAW_PACKET_BUFFER_SIZE 32000 + int raw_packet_buffer_remaining_size; } AVFormatContext; typedef struct AVPacketList {
--- a/utils.c Thu Jun 25 00:17:47 2009 +0000 +++ b/utils.c Thu Jun 25 18:48:57 2009 +0000 @@ -401,6 +401,8 @@ ff_metadata_demux_compat(ic); #endif + ic->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; + *ic_ptr = ic; return 0; fail: @@ -532,8 +534,13 @@ if (pktl) { *pkt = pktl->pkt; if(s->streams[pkt->stream_index]->codec->codec_id != CODEC_ID_PROBE || - !s->streams[pkt->stream_index]->probe_packets){ + !s->streams[pkt->stream_index]->probe_packets || + s->raw_packet_buffer_remaining_size < pkt->size){ + AVProbeData *pd = &s->streams[pkt->stream_index]->probe_data; + av_freep(&pd->buf); + pd->buf_size = 0; s->raw_packet_buffer = pktl->next; + s->raw_packet_buffer_remaining_size += pkt->size; av_free(pktl); return 0; } @@ -567,6 +574,7 @@ return ret; add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end); + s->raw_packet_buffer_remaining_size -= pkt->size; if(st->codec->codec_id == CODEC_ID_PROBE){ AVProbeData *pd = &st->probe_data; @@ -1102,6 +1110,7 @@ av_free_packet(&pktl->pkt); av_free(pktl); } + s->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; } /*******************************************************/