X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fflvdec.c;h=c6428b4bbc91f4d03f55a72620608ba074326d72;hb=12ad66712a18d039eea73a742ae626b2376f8f4f;hp=ad14d3b3c950dc342d20e55c6f10a7578a0a2cd8;hpb=bde15e74de442cebf61acc6cd598a13aca249030;p=ffmpeg diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index ad14d3b3c95..c6428b4bbc9 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: @@ -23,15 +23,23 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/avstring.h" +#include "libavcodec/bytestream.h" +#include "libavcodec/mpeg4audio.h" #include "avformat.h" #include "flv.h" +typedef struct { + int wrong_dts; ///< wrong dts due to negative cts +} FLVContext; + static int flv_probe(AVProbeData *p) { const uint8_t *d; d = p->buf; - if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0) { + if (d[0] == 'F' && d[1] == 'L' && d[2] == 'V' && d[3] < 5 && d[5]==0 && AV_RB32(d+5)>8) { return AVPROBE_SCORE_MAX; } return 0; @@ -42,19 +50,23 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags case FLV_CODECID_PCM: - acodec->codec_id = acodec->bits_per_sample == 8 ? CODEC_ID_PCM_S8 : -#ifdef WORDS_BIGENDIAN + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_S8 : +#if HAVE_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; @@ -70,6 +82,7 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co 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_SCREEN2: vcodec->codec_id = CODEC_ID_FLASHSV2; break; case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; case FLV_CODECID_VP6A : if(flv_codecid == FLV_CODECID_VP6A) @@ -91,25 +104,25 @@ static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_co return 0; } -static int amf_get_string(ByteIOContext *ioc, char *buffer, int buffsize) { - int length = get_be16(ioc); - if(length >= buffsize) { - url_fskip(ioc, length); - return -1; - } +static int amf_get_string(ByteIOContext *ioc, char **buf) +{ + uint16_t len = get_be16(ioc); - get_buffer(ioc, buffer, length); + *buf = av_malloc(len+1); + if (!*buf) + return AVERROR_NOMEM; - buffer[length] = '\0'; + get_buffer(ioc, *buf, len); + (*buf)[len] = '\0'; - return length; + return len; } -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; - char str_val[256]; + char *str = NULL; double num_val; num_val = 0; @@ -123,7 +136,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst case AMF_DATA_TYPE_BOOL: num_val = get_byte(ioc); break; case AMF_DATA_TYPE_STRING: - if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0) + if(amf_get_string(ioc, &str) < 0) return -1; break; case AMF_DATA_TYPE_OBJECT: { @@ -144,10 +157,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst break; //these take up no additional space case AMF_DATA_TYPE_MIXEDARRAY: url_fskip(ioc, 4); //skip 32-bit max array index - while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { + while(url_ftell(ioc) < max_pos - 2 && amf_get_string(ioc, &str) > 0) { //this is the only case in which we would want a nested parse to not skip over the object - if(amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) + if(amf_parse_object(s, astream, vstream, str, max_pos, depth + 1) < 0) return -1; + av_freep(&str); } if(get_byte(ioc) != AMF_END_OF_OBJECT) return -1; @@ -174,55 +188,38 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst vcodec = vstream ? vstream->codec : NULL; if(amf_type == AMF_DATA_TYPE_BOOL) { - if(!strcmp(key, "stereo") && acodec) acodec->channels = num_val > 0 ? 2 : 1; + av_metadata_set2(&s->metadata, key, av_d2str(num_val), AV_METADATA_DONT_STRDUP_VAL); } else if(amf_type == AMF_DATA_TYPE_NUMBER) { + av_metadata_set2(&s->metadata, key, av_d2str(num_val), AV_METADATA_DONT_STRDUP_VAL); 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 && 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_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 - 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; - } - } - } - } + else if(!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0)) + vcodec->bit_rate = num_val * 1024.0; + } else if (amf_type == AMF_DATA_TYPE_STRING) + av_metadata_set2(&s->metadata, key, str, + AV_METADATA_DONT_STRDUP_VAL); } 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; - int i, keylen; - char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want. + int i; + char *buf = NULL; //only needs to hold the string "onMetaData". Anything longer is something we don't want. astream = NULL; vstream = NULL; - keylen = 0; ioc = s->pb; //first object needs to be "onMetaData" string type = get_byte(ioc); - if(type != AMF_DATA_TYPE_STRING || amf_get_string(ioc, buffer, sizeof(buffer)) < 0 || strcmp(buffer, "onMetaData")) + if (type != AMF_DATA_TYPE_STRING || + amf_get_string(ioc, &buf) < 0 || strcmp(buf, "onMetaData")) { + av_freep(&buf); return -1; + } //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called. for(i = 0; i < s->nb_streams; i++) { @@ -232,8 +229,9 @@ static int flv_read_metabody(AVFormatContext *s, unsigned int next_pos) { } //parse the second object (we want a mixed array) - if(amf_parse_object(s, astream, vstream, buffer, next_pos, 0) < 0) + if(amf_parse_object(s, astream, vstream, buf, next_pos, 0) < 0) return -1; + av_freep(&buf); return 0; } @@ -295,11 +293,12 @@ static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size) static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) { - int ret, i, type, size, flags, is_audio, next, pos; - unsigned dts; + 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; - retry: for(;;){ pos = url_ftell(s->pb); url_fskip(s->pb, 4); /* size of previous packet */ @@ -309,7 +308,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) 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); + return AVERROR_EOF; url_fskip(s->pb, 3); /* stream id, always 0 */ flags = 0; @@ -321,18 +320,27 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) if (type == FLV_TAG_TYPE_AUDIO) { is_audio=1; flags = get_byte(s->pb); + size--; } else if (type == FLV_TAG_TYPE_VIDEO) { is_audio=0; 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); + av_log(s, AV_LOG_DEBUG, "skipping flv packet: type %d, size %d, flags %d\n", type, size, flags); + 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]; @@ -340,11 +348,11 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) break; } if(i == s->nb_streams){ - av_log(NULL, AV_LOG_ERROR, "invalid stream\n"); + av_log(s, AV_LOG_ERROR, "invalid stream\n"); 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); +// av_log(s, 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 @@ -360,25 +368,26 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) // 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); + 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; + uint32_t ts = get_be24(s->pb); + ts |= get_byte(s->pb) << 24; + s->duration = ts * (int64_t)AV_TIME_BASE / 1000; } 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{ @@ -390,25 +399,45 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) int type = get_byte(s->pb); size--; if (st->codec->codec_id == CODEC_ID_H264) { - // cts offset ignored because it might to be signed - // and would cause pts < dts - get_be24(s->pb); + 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 - 1)) < 0) + if ((ret = flv_get_extradata(s, st, size)) < 0) return ret; - goto retry; + if (st->codec->codec_id == CODEC_ID_AAC) { + MPEG4AudioConfig cfg; + ff_mpeg4audio_get_config(&cfg, st->codec->extradata, + st->codec->extradata_size); + st->codec->channels = cfg.channels; + st->codec->sample_rate = cfg.sample_rate; + dprintf(s, "mp4a config channels %d sample rate %d\n", + st->codec->channels, st->codec->sample_rate); + } + + return AVERROR(EAGAIN); } } - ret= av_get_packet(s->pb, pkt, size - 1); - if (ret <= 0) { + /* skip empty data packets */ + if (!size) + return AVERROR(EAGAIN); + + 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->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)) @@ -420,7 +449,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) AVInputFormat flv_demuxer = { "flv", NULL_IF_CONFIG_SMALL("FLV format"), - 0, + sizeof(FLVContext), flv_probe, flv_read_header, flv_read_packet,