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

get rid of AVFMTCTX_NOHEADER, create streams in read_header()

Browse Source 
Originally committed as revision 7268 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-12-10 17:25:30 +00:00
parent c45388b193
commit 4eb0c66505
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/flvdec.c
View File

@ -44,12 +44,26 @@ static int flv_read_header(AVFormatContext *s,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
int offset, flags, size; int offset, flags, size;
AVStream *st;
s->ctx_flags |= AVFMTCTX_NOHEADER; //ok we have a header but theres no fps, codec type, sample_rate, ...
url_fskip(&s->pb, 4); url_fskip(&s->pb, 4);
flags = get_byte(&s->pb); flags = get_byte(&s->pb);
if(flags & FLV_HEADER_FLAG_HASVIDEO){
st = av_new_stream(s, 0);
if (!st)
return AVERROR_NOMEM;
st->codec->codec_type = CODEC_TYPE_VIDEO;
av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
}
if(flags & FLV_HEADER_FLAG_HASAUDIO){
st = av_new_stream(s, 1);
if (!st)
return AVERROR_NOMEM;
st->codec->codec_type = CODEC_TYPE_AUDIO;
av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
}
offset = get_be32(&s->pb); offset = get_be32(&s->pb);
if(!url_is_streamed(&s->pb)){ if(!url_is_streamed(&s->pb)){
@ -151,12 +165,9 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
break; break;
} }
if(i == s->nb_streams){ if(i == s->nb_streams){
st = av_new_stream(s, is_audio); av_log(NULL, AV_LOG_ERROR, "invalid stream\n");
if (!st) url_fseek(&s->pb, next, SEEK_SET);
return AVERROR_NOMEM; continue;
av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
st->codec->time_base= (AVRational){1,1000};
} }
// av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard); // av_log(NULL, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard);
if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio)) if( (st->discard >= AVDISCARD_NONKEY && !((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY || is_audio))
@ -173,7 +184,6 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if(is_audio){ if(is_audio){
if(st->codec->sample_rate == 0){ if(st->codec->sample_rate == 0){
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1;
if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO) if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO)
st->codec->sample_rate= 8000; st->codec->sample_rate= 8000;
@ -194,7 +204,6 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8;
} }
}else{ }else{
st->codec->codec_type = CODEC_TYPE_VIDEO;
switch(flags & FLV_VIDEO_CODECID_MASK){ switch(flags & FLV_VIDEO_CODECID_MASK){
case FLV_CODECID_H263 : st->codec->codec_id = CODEC_ID_FLV1 ; break; case FLV_CODECID_H263 : st->codec->codec_id = CODEC_ID_FLV1 ; break;
case FLV_CODECID_SCREEN: st->codec->codec_id = CODEC_ID_FLASHSV; break; case FLV_CODECID_SCREEN: st->codec->codec_id = CODEC_ID_FLASHSV; break;