generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix codec probing, stop after MAX_PROBE_PACKETS and return all packets

Browse Source 
Originally committed as revision 19000 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-05-31 00:24:06 +00:00
parent 2b9969a945
commit 86cb7e33cc
2 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/avformat.h
View File

@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H #define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MAJOR 52
#define LIBAVFORMAT_VERSION_MINOR 33 #define LIBAVFORMAT_VERSION_MINOR 34
#define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
@ -443,6 +443,13 @@ typedef struct AVStream {
* AV_NOPTS_VALUE by default. * AV_NOPTS_VALUE by default.
*/ */
int64_t reference_dts; int64_t reference_dts;
/**
* Number of packets to buffer for codec probing
* NOT PART OF PUBLIC API
*/
#define MAX_PROBE_PACKETS 100
int probe_packets;
} AVStream; } AVStream;
#define AV_PROGRAM_RUNNING 1 #define AV_PROGRAM_RUNNING 1

28
libavformat/utils.c
View File

@ -520,7 +520,7 @@ static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt,
int av_read_packet(AVFormatContext *s, AVPacket *pkt) int av_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret; int ret, i;
AVStream *st; AVStream *st;
for(;;){ for(;;){
@ -528,7 +528,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
if (pktl) { if (pktl) {
*pkt = pktl->pkt; *pkt = pktl->pkt;
if(s->streams[pkt->stream_index]->codec->codec_id != CODEC_ID_PROBE){ if(s->streams[pkt->stream_index]->codec->codec_id != CODEC_ID_PROBE ||
!s->streams[pkt->stream_index]->probe_packets){
s->raw_packet_buffer = pktl->next; s->raw_packet_buffer = pktl->next;
av_free(pktl); av_free(pktl);
return 0; return 0;
@ -537,8 +538,13 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
av_init_packet(pkt); av_init_packet(pkt);
ret= s->iformat->read_packet(s, pkt); ret= s->iformat->read_packet(s, pkt);
if (ret < 0) if (ret < 0) {
return ret; if (!pktl || ret == AVERROR(EAGAIN))
return ret;
for (i = 0; i < s->nb_streams; i++)
s->streams[i]->probe_packets = 0;
continue;
}
st= s->streams[pkt->stream_index]; st= s->streams[pkt->stream_index];
switch(st->codec->codec_type){ switch(st->codec->codec_type){
@ -553,7 +559,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
break; break;
} }
if(!pktl && st->codec->codec_id!=CODEC_ID_PROBE) if(!pktl && (st->codec->codec_id != CODEC_ID_PROBE ||
!st->probe_packets))
return ret; return ret;
add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end); add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end);
@ -561,6 +568,8 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
if(st->codec->codec_id == CODEC_ID_PROBE){ if(st->codec->codec_id == CODEC_ID_PROBE){
AVProbeData *pd = &st->probe_data; AVProbeData *pd = &st->probe_data;
--st->probe_packets;
pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE); pd->buf = av_realloc(pd->buf, pd->buf_size+pkt->size+AVPROBE_PADDING_SIZE);
memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size); memcpy(pd->buf+pd->buf_size, pkt->data, pkt->size);
pd->buf_size += pkt->size; pd->buf_size += pkt->size;
@ -1081,6 +1090,12 @@ static void flush_packet_queue(AVFormatContext *s)
av_free_packet(&pktl->pkt); av_free_packet(&pktl->pkt);
av_free(pktl); av_free(pktl);
} }
while(s->raw_packet_buffer){
pktl = s->raw_packet_buffer;
s->raw_packet_buffer = pktl->next;
av_free_packet(&pktl->pkt);
av_free(pktl);
}
} }
/*******************************************************/ /*******************************************************/
@ -1132,6 +1147,8 @@ static void av_read_frame_flush(AVFormatContext *s)
/* fail safe */ /* fail safe */
st->cur_ptr = NULL; st->cur_ptr = NULL;
st->cur_len = 0; st->cur_len = 0;
st->probe_packets = MAX_PROBE_PACKETS;
} }
} }
@ -2342,6 +2359,7 @@ AVStream *av_new_stream(AVFormatContext *s, int id)
timestamps corrected before they are returned to the user */ timestamps corrected before they are returned to the user */
st->cur_dts = 0; st->cur_dts = 0;
st->first_dts = AV_NOPTS_VALUE; st->first_dts = AV_NOPTS_VALUE;
st->probe_packets = MAX_PROBE_PACKETS;
/* default pts setting is MPEG-like */ /* default pts setting is MPEG-like */
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);