X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fflvdec.c;h=5fee6b70afb450da9af3f579bc2cd2b67614be66;hb=dce25564cc554cc85c8c28928b1b8d3f965c1b16;hp=78f3cbdfbda7925e28fbe23d4d0727e84986d22e;hpb=f84c35732587e0e5589b59f9c1ba2c366a1683bf;p=ffmpeg diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 78f3cbdfbda..5fee6b70afb 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1,6 +1,6 @@ /* * FLV demuxer - * Copyright (c) 2003 The FFmpeg Project. + * Copyright (c) 2003 The FFmpeg Project * * This demuxer will generate a 1 byte extradata for VP6F content. * It is composed of: @@ -27,10 +27,7 @@ #include "flv.h" typedef struct { - AVStream *alpha_stream; - int pts; - int flags; - int alpha_size; + int wrong_dts; ///< wrong dts due to negative cts } FLVContext; static int flv_probe(AVProbeData *p) @@ -48,15 +45,28 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c AVCodecContext *acodec = astream->codec; switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags - case FLV_CODECID_PCM_BE: - acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16BE; break; + case FLV_CODECID_PCM: + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : +#ifdef WORDS_BIGENDIAN + CODEC_ID_PCM_S16BE; +#else + CODEC_ID_PCM_S16LE; +#endif + break; case FLV_CODECID_PCM_LE: - acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break; + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : CODEC_ID_PCM_S16LE; break; + case FLV_CODECID_AAC : acodec->codec_id = CODEC_ID_AAC; break; case FLV_CODECID_ADPCM: acodec->codec_id = CODEC_ID_ADPCM_SWF; break; + case FLV_CODECID_SPEEX: + acodec->codec_id = CODEC_ID_SPEEX; + acodec->sample_rate = 16000; + break; case FLV_CODECID_MP3 : acodec->codec_id = CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break; - case FLV_CODECID_NELLYMOSER_8HZ_MONO: + case FLV_CODECID_NELLYMOSER_8KHZ_MONO: acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate case FLV_CODECID_NELLYMOSER: + acodec->codec_id = CODEC_ID_NELLYMOSER; + break; default: av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); acodec->codec_tag = flv_codecid >> FLV_AUDIO_CODECID_OFFSET; @@ -64,33 +74,23 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c } static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { - FLVContext *flv = s->priv_data; AVCodecContext *vcodec = vstream->codec; switch(flv_codecid) { case FLV_CODECID_H263 : vcodec->codec_id = CODEC_ID_FLV1 ; break; case FLV_CODECID_SCREEN: vcodec->codec_id = CODEC_ID_FLASHSV; break; - case FLV_CODECID_VP6A : - if (!flv->alpha_stream) { - AVCodecContext *alpha_codec; - flv->alpha_stream = av_new_stream(s, 2); - if (flv->alpha_stream) { - av_set_pts_info(flv->alpha_stream, 24, 1, 1000); - alpha_codec = flv->alpha_stream->codec; - alpha_codec->codec_type = CODEC_TYPE_VIDEO; - alpha_codec->codec_id = CODEC_ID_VP6F; - alpha_codec->extradata_size = 1; - alpha_codec->extradata = av_malloc(1); - } - } case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; + case FLV_CODECID_VP6A : + if(flv_codecid == FLV_CODECID_VP6A) + vcodec->codec_id = CODEC_ID_VP6A; if(vcodec->extradata_size != 1) { vcodec->extradata_size = 1; vcodec->extradata = av_malloc(1); } - vcodec->extradata[0] = get_byte(&s->pb); - if (flv->alpha_stream) - flv->alpha_stream->codec->extradata[0] = vcodec->extradata[0]; + vcodec->extradata[0] = get_byte(s->pb); return 1; // 1 byte body size adjustment for flv_read_packet() + case FLV_CODECID_H264: + vcodec->codec_id = CODEC_ID_H264; + return 3; // not 4, reading packet type will consume one byte default: av_log(s, AV_LOG_INFO, "Unsupported video codec (%x)\n", flv_codecid); vcodec->codec_tag = flv_codecid; @@ -113,7 +113,7 @@ static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) { return length; } -static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, unsigned int max_pos, int depth) { +static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t max_pos, int depth) { AVCodecContext *acodec, *vcodec; ByteIOContext *ioc; AMFDataType amf_type; @@ -121,7 +121,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst double num_val; num_val = 0; - ioc = &s->pb; + ioc = s->pb; amf_type = get_byte(ioc); @@ -187,22 +187,26 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE; // else if(!strcmp(key, "width") && vcodec && num_val > 0) vcodec->width = num_val; // else if(!strcmp(key, "height") && vcodec && num_val > 0) vcodec->height = num_val; - else if(!strcmp(key, "audiocodecid") && acodec) flv_set_audio_codec(s, astream, (int)num_val << FLV_AUDIO_CODECID_OFFSET); - else if(!strcmp(key, "videocodecid") && vcodec) flv_set_video_codec(s, vstream, (int)num_val); - else if(!strcmp(key, "audiosamplesize") && acodec && num_val >= 0) { - acodec->bits_per_sample = num_val; + else if(!strcmp(key, "audiocodecid") && acodec && 0 <= (int)num_val) + flv_set_audio_codec(s, astream, (int)num_val << FLV_AUDIO_CODECID_OFFSET); + else if(!strcmp(key, "videocodecid") && vcodec && 0 <= (int)num_val) + flv_set_video_codec(s, vstream, (int)num_val); + else if(!strcmp(key, "audiosamplesize") && acodec && 0 < (int)num_val) { + acodec->bits_per_coded_sample = num_val; //we may have to rewrite a previously read codecid because FLV only marks PCM endianness. if(num_val == 8 && (acodec->codec_id == CODEC_ID_PCM_S16BE || acodec->codec_id == CODEC_ID_PCM_S16LE)) acodec->codec_id = CODEC_ID_PCM_S8; } else if(!strcmp(key, "audiosamplerate") && acodec && num_val >= 0) { //some tools, like FLVTool2, write consistently approximate metadata sample rates - switch((int)num_val) { - case 44000: acodec->sample_rate = 44100 ; break; - case 22000: acodec->sample_rate = 22050 ; break; - case 11000: acodec->sample_rate = 11025 ; break; - case 5000 : acodec->sample_rate = 5512 ; break; - default : acodec->sample_rate = num_val; + if (!acodec->sample_rate) { + switch((int)num_val) { + case 44000: acodec->sample_rate = 44100 ; break; + case 22000: acodec->sample_rate = 22050 ; break; + case 11000: acodec->sample_rate = 11025 ; break; + case 5000 : acodec->sample_rate = 5512 ; break; + default : acodec->sample_rate = num_val; + } } } } @@ -211,7 +215,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst return 0; } -static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) { +static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { AMFDataType type; AVStream *stream, *astream, *vstream; ByteIOContext *ioc; @@ -221,7 +225,7 @@ static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) { astream = NULL; vstream = NULL; keylen = 0; - ioc = &s->pb; + ioc = s->pb; //first object needs to be "onMetaData" string type = get_byte(ioc); @@ -242,14 +246,22 @@ static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) { return 0; } +static AVStream *create_stream(AVFormatContext *s, int is_audio){ + AVStream *st = av_new_stream(s, is_audio); + if (!st) + return NULL; + st->codec->codec_type = is_audio ? CODEC_TYPE_AUDIO : CODEC_TYPE_VIDEO; + av_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + return st; +} + static int flv_read_header(AVFormatContext *s, AVFormatParameters *ap) { int offset, flags; - AVStream *st; - url_fskip(&s->pb, 4); - flags = get_byte(&s->pb); + url_fskip(s->pb, 4); + flags = get_byte(s->pb); /* old flvtool cleared this field */ /* FIXME: better fix needed */ if (!flags) { @@ -257,76 +269,89 @@ static int flv_read_header(AVFormatContext *s, av_log(s, AV_LOG_WARNING, "Broken FLV file, which says no streams present, this might fail\n"); } + if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO)) + != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO)) + s->ctx_flags |= AVFMTCTX_NOHEADER; + if(flags & FLV_HEADER_FLAG_HASVIDEO){ - st = av_new_stream(s, 0); - if (!st) + if(!create_stream(s, 0)) return AVERROR(ENOMEM); - 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) + if(!create_stream(s, 1)) return AVERROR(ENOMEM); - 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); - url_fseek(&s->pb, offset, SEEK_SET); + offset = get_be32(s->pb); + url_fseek(s->pb, offset, SEEK_SET); s->start_time = 0; return 0; } +static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size) +{ + av_free(st->codec->extradata); + st->codec->extradata = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!st->codec->extradata) + return AVERROR(ENOMEM); + st->codec->extradata_size = size; + get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size); + return 0; +} + static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret, i, type, size, flags, is_audio, next, pos; FLVContext *flv = s->priv_data; + int ret, i, type, size, flags, is_audio; + int64_t next, pos; + int64_t dts, pts = AV_NOPTS_VALUE; AVStream *st = NULL; - if (flv->alpha_stream && flv->alpha_size) { - is_audio = 0; - size = flv->alpha_size; - flv->alpha_size = 0; - flags = flv->flags; - st = flv->alpha_stream; - goto packet; - } - + retry: for(;;){ - pos = url_ftell(&s->pb); - url_fskip(&s->pb, 4); /* size of previous packet */ - type = get_byte(&s->pb); - size = get_be24(&s->pb); - flv->pts = get_be24(&s->pb); -// av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, pts:%d\n", type, size, flv->pts); - if (url_feof(&s->pb)) + pos = url_ftell(s->pb); + url_fskip(s->pb, 4); /* size of previous packet */ + type = get_byte(s->pb); + size = get_be24(s->pb); + dts = get_be24(s->pb); + dts |= get_byte(s->pb) << 24; +// av_log(s, AV_LOG_DEBUG, "type:%d, size:%d, dts:%d\n", type, size, dts); + if (url_feof(s->pb)) return AVERROR(EIO); - url_fskip(&s->pb, 4); /* reserved */ + url_fskip(s->pb, 3); /* stream id, always 0 */ flags = 0; if(size == 0) continue; - next= size + url_ftell(&s->pb); + next= size + url_ftell(s->pb); if (type == FLV_TAG_TYPE_AUDIO) { is_audio=1; - flags = get_byte(&s->pb); + flags = get_byte(s->pb); + size--; } else if (type == FLV_TAG_TYPE_VIDEO) { is_audio=0; - flags = get_byte(&s->pb); + flags = get_byte(s->pb); + size--; + if ((flags & 0xf0) == 0x50) /* video info / command frame */ + goto skip; } else { if (type == FLV_TAG_TYPE_META && size > 13+1+4) flv_read_metabody(s, next); else /* skip packet */ av_log(s, AV_LOG_ERROR, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); - url_fseek(&s->pb, next, SEEK_SET); + skip: + url_fseek(s->pb, next, SEEK_SET); continue; } + /* skip empty data packets */ + if (!size) + continue; + /* now find stream */ for(i=0;inb_streams;i++) { st = s->streams[i]; @@ -335,68 +360,79 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) } if(i == s->nb_streams){ av_log(NULL, AV_LOG_ERROR, "invalid stream\n"); - url_fseek(&s->pb, next, SEEK_SET); - continue; + st= create_stream(s, is_audio); + s->ctx_flags &= ~AVFMTCTX_NOHEADER; } // 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)) ||(st->discard >= AVDISCARD_BIDIR && ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_DISP_INTER && !is_audio)) || st->discard >= AVDISCARD_ALL ){ - url_fseek(&s->pb, next, SEEK_SET); + url_fseek(s->pb, next, SEEK_SET); continue; } if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) - av_add_index_entry(st, pos, flv->pts, size, 0, AVINDEX_KEYFRAME); + av_add_index_entry(st, pos, dts, size, 0, AVINDEX_KEYFRAME); 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){ + 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; + const int64_t pos= url_ftell(s->pb); + const int64_t 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); + url_fseek(s->pb, pos, SEEK_SET); } if(is_audio){ - if(!st->codec->sample_rate || !st->codec->bits_per_sample || (!st->codec->codec_id && !st->codec->codec_tag)) { + if(!st->codec->channels || !st->codec->sample_rate || !st->codec->bits_per_coded_sample) { st->codec->channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; - if((flags & FLV_AUDIO_CODECID_MASK) == FLV_CODECID_NELLYMOSER_8HZ_MONO) - st->codec->sample_rate= 8000; - else - st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3); - st->codec->bits_per_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; + st->codec->sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3); + st->codec->bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; + } + if(!st->codec->codec_id){ flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); } }else{ size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); } - if ((flags & FLV_VIDEO_CODECID_MASK) == FLV_CODECID_VP6A) { - int alpha_offset = get_be24(&s->pb); - if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) - av_add_index_entry(flv->alpha_stream, pos, flv->pts, size, - 0, AVINDEX_KEYFRAME); - flv->alpha_size = size - 3 - alpha_offset; - size = alpha_offset + 1; - flv->flags = flags; + if (st->codec->codec_id == CODEC_ID_AAC || + st->codec->codec_id == CODEC_ID_H264) { + int type = get_byte(s->pb); + size--; + if (st->codec->codec_id == CODEC_ID_H264) { + int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension + pts = dts + cts; + if (cts < 0) { // dts are wrong + flv->wrong_dts = 1; + av_log(s, AV_LOG_WARNING, "negative cts, previous timestamps might be wrong\n"); + } + if (flv->wrong_dts) + dts = AV_NOPTS_VALUE; + } + if (type == 0) { + if ((ret = flv_get_extradata(s, st, size)) < 0) + return ret; + goto retry; + } } -packet: - ret= av_get_packet(&s->pb, pkt, size - 1); + + ret= av_get_packet(s->pb, pkt, size); if (ret <= 0) { return AVERROR(EIO); } /* note: we need to modify the packet size here to handle the last packet */ pkt->size = ret; - pkt->pts = flv->pts; + pkt->dts = dts; + pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts; pkt->stream_index = st->index; if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)) @@ -405,31 +441,13 @@ packet: return ret; } -static int flv_read_close(AVFormatContext *s) -{ - return 0; -} - -static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags) -{ - AVStream *st = s->streams[stream_index]; - int index = av_index_search_timestamp(st, timestamp, flags); - if (index < 0) - return -1; - url_fseek(&s->pb, st->index_entries[index].pos, SEEK_SET); - - return 0; -} - AVInputFormat flv_demuxer = { "flv", - "flv format", + NULL_IF_CONFIG_SMALL("FLV format"), sizeof(FLVContext), flv_probe, flv_read_header, flv_read_packet, - flv_read_close, - flv_read_seek, .extensions = "flv", .value = CODEC_ID_FLV1, };