har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove codec_info_duration/nb_frames from AVStream

Browse Source 
Originally committed as revision 8337 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-03-12 10:59:47 +00:00
parent 17ceb4f9d1
commit ea486ab3be
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avformat.h
View File

@ -275,9 +275,11 @@ typedef struct AVStream {
*/ */
AVRational r_frame_rate; AVRational r_frame_rate;
void *priv_data; void *priv_data;
#if LIBAVFORMAT_VERSION_INT < (52<<16)
/* internal data used in av_find_stream_info() */ /* internal data used in av_find_stream_info() */
int64_t codec_info_duration; int64_t codec_info_duration;
int codec_info_nb_frames; int codec_info_nb_frames;
#endif
/** encoding: PTS generation when outputing stream */ /** encoding: PTS generation when outputing stream */
AVFrac pts; AVFrac pts;

13
libavformat/utils.c
View File

@ -1679,6 +1679,8 @@ int av_find_stream_info(AVFormatContext *ic)
int duration_count[MAX_STREAMS]={0}; int duration_count[MAX_STREAMS]={0};
double (*duration_error)[MAX_STD_TIMEBASES]; double (*duration_error)[MAX_STD_TIMEBASES];
offset_t old_offset = url_ftell(&ic->pb); offset_t old_offset = url_ftell(&ic->pb);
int64_t codec_info_duration[MAX_STREAMS]={0};
int codec_info_nb_frames[MAX_STREAMS]={0};
duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error)); duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error));
if (!duration_error) return AVERROR_NOMEM; if (!duration_error) return AVERROR_NOMEM;
@ -1777,10 +1779,10 @@ int av_find_stream_info(AVFormatContext *ic)
read_size += pkt->size; read_size += pkt->size;
st = ic->streams[pkt->stream_index]; st = ic->streams[pkt->stream_index];
if(st->codec_info_nb_frames>1) //FIXME move codec_info_nb_frames and codec_info_duration from AVStream into this func if(codec_info_nb_frames[st->index]>1)
st->codec_info_duration += pkt->duration; codec_info_duration[st->index] += pkt->duration;
if (pkt->duration != 0) if (pkt->duration != 0)
st->codec_info_nb_frames++; codec_info_nb_frames[st->index]++;
{ {
int index= pkt->stream_index; int index= pkt->stream_index;
@ -1801,9 +1803,6 @@ int av_find_stream_info(AVFormatContext *ic)
duration_error[index][i] += error*error; duration_error[index][i] += error*error;
} }
duration_count[index]++; duration_count[index]++;
if(st->codec_info_nb_frames == 0 && 0)
st->codec_info_duration += duration;
} }
if(last == AV_NOPTS_VALUE || duration_count[index]<=1) if(last == AV_NOPTS_VALUE || duration_count[index]<=1)
last_dts[pkt->stream_index]= pkt->dts; last_dts[pkt->stream_index]= pkt->dts;
@ -1839,7 +1838,7 @@ int av_find_stream_info(AVFormatContext *ic)
(st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/) (st->codec->codec_id == CODEC_ID_MPEG4 && !st->need_parsing))*/)
try_decode_frame(st, pkt->data, pkt->size); try_decode_frame(st, pkt->data, pkt->size);
if (av_rescale_q(st->codec_info_duration, st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration) { if (av_rescale_q(codec_info_duration[st->index], st->time_base, AV_TIME_BASE_Q) >= ic->max_analyze_duration) {
break; break;
} }
count++; count++;