diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-06-25 18:48:57 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-06-25 18:48:57 +0000 |
| commit | af122d6a80686d9c786b4b46213ef1f5a9699b3e (patch) | |
| tree | a8a5c510b571db853ba8934b72a359f42724264b /libavformat | |
| parent | 57f6d52a223b3fabbb5a4336b4d4923429b9201f (diff) | |
limit raw packet buffer size used for codec probing
Originally committed as revision 19272 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 11 | ||||
| -rw-r--r-- | libavformat/utils.c | 11 |
2 files changed, 19 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 25653cd39a..9a1a41e612 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -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 @@ typedef struct AVFormatContext { 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 { diff --git a/libavformat/utils.c b/libavformat/utils.c index 7422f599d6..5806b2382e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -401,6 +401,8 @@ int av_open_input_stream(AVFormatContext **ic_ptr, 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 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) 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 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) 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 @@ static void flush_packet_queue(AVFormatContext *s) av_free_packet(&pktl->pkt); av_free(pktl); } + s->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; } /*******************************************************/ |