virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

move duration finding code into read_packet() so it can be skiped if duration has already been set

Browse Source 
Originally committed as revision 7272 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-12-10 17:53:01 +00:00
parent 17fcb1709f
commit 15f14fc7c2
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavformat/flvdec.c
View File

@ -57,7 +57,7 @@ static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) {
static int flv_read_header(AVFormatContext *s, static int flv_read_header(AVFormatContext *s,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
int offset, flags, size; int offset, flags;
AVStream *st; AVStream *st;
url_fskip(&s->pb, 4); url_fskip(&s->pb, 4);
@ -79,17 +79,6 @@ static int flv_read_header(AVFormatContext *s,
} }
offset = get_be32(&s->pb); offset = get_be32(&s->pb);
if(!url_is_streamed(&s->pb)){
const int fsize= url_fsize(&s->pb);
url_fseek(&s->pb, fsize-4, SEEK_SET);
size= get_be32(&s->pb);
url_fseek(&s->pb, fsize-3-size, SEEK_SET);
if(size == get_be24(&s->pb) + 11){
s->duration= get_be24(&s->pb) * (int64_t)AV_TIME_BASE / 1000;
}
}
url_fseek(&s->pb, offset, SEEK_SET); url_fseek(&s->pb, offset, SEEK_SET);
s->start_time = 0; s->start_time = 0;
@ -190,6 +179,20 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
break; break;
} }
// if not streamed and no duration from metadata then seek to end to find the duration from the timestamps
if(!url_is_streamed(&s->pb) && s->duration==AV_NOPTS_VALUE){
int size;
const int pos= url_ftell(&s->pb);
const int fsize= url_fsize(&s->pb);
url_fseek(&s->pb, fsize-4, SEEK_SET);
size= get_be32(&s->pb);
url_fseek(&s->pb, fsize-3-size, SEEK_SET);
if(size == get_be24(&s->pb) + 11){
s->duration= get_be24(&s->pb) * (int64_t)AV_TIME_BASE / 1000;
}
url_fseek(&s->pb, pos, SEEK_SET);
}
if(is_audio){ if(is_audio){
if(st->codec->sample_rate == 0){ if(st->codec->sample_rate == 0){
st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;