diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-01 20:17:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-03 16:40:11 +0200 |
| commit | 15957b197a63d08c33c34f08ef8b161335736914 (patch) | |
| tree | 0358ddf31803b6b7e5caef199d5a1401de842e3c | |
| parent | 6e77feb201924f16bd69cbb5cfabb1a7b5e8a52e (diff) | |
| download | ffmpeg-15957b197a63d08c33c34f08ef8b161335736914.tar.gz | |
Partial rewrite stream probe code.
Fix issue2312.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index be756c52ad..8b0060f507 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -689,11 +689,7 @@ 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->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->streams[pkt->stream_index]->probe_packets){ s->raw_packet_buffer = pktl->next; s->raw_packet_buffer_remaining_size += pkt->size; av_free(pktl); @@ -731,9 +727,10 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) 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){ + if(st->codec->codec_id == CODEC_ID_PROBE && st->probe_packets){ AVProbeData *pd = &st->probe_data; - av_log(s, AV_LOG_DEBUG, "probing stream %d\n", st->index); + int end; + av_log(s, AV_LOG_DEBUG, "probing stream %d pp:%d\n", st->index, st->probe_packets); --st->probe_packets; pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE); @@ -741,13 +738,19 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) pd->buf_size += pkt->size; memset(pd->buf+pd->buf_size, 0, AVPROBE_PADDING_SIZE); - if(av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ - //FIXME we dont reduce score to 0 for the case of running out of buffer space in bytes - set_codec_from_probe_data(s, st, pd, st->probe_packets > 0 ? AVPROBE_SCORE_MAX/4 : 0); - if(st->codec->codec_id != CODEC_ID_PROBE){ + end= s->raw_packet_buffer_remaining_size <= 0 + || st->probe_packets<=0; + + if(end || av_log2(pd->buf_size) != av_log2(pd->buf_size - pkt->size)){ + set_codec_from_probe_data(s, st, pd, end ? 0 : AVPROBE_SCORE_MAX/4); + if(st->codec->codec_id != CODEC_ID_PROBE || end){ pd->buf_size=0; av_freep(&pd->buf); + st->probe_packets= 0; + if(st->codec->codec_id != CODEC_ID_PROBE){ av_log(s, AV_LOG_DEBUG, "probed stream %d\n", st->index); + }else + av_log(s, AV_LOG_WARNING, "probed stream %d failed\n", st->index); } } } |