X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fflvdec.c;h=084d012a613b2d7917b8465f1b3be11856dcb709;hb=e6153f173a49e5bfa70b0c04d2f82930533597b9;hp=fcdf2143af0e69bc1b5cf3b92a83b3f2887dc6b0;hpb=2ef6c1242aeebf863b86f34229490a023bfe65dc;p=ffmpeg diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index fcdf2143af0..084d012a613 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1,37 +1,61 @@ /* * FLV demuxer - * Copyright (c) 2003 The FFmpeg Project + * Copyright (c) 2003 The Libav Project * * This demuxer will generate a 1 byte extradata for VP6F content. * It is composed of: * - upper 4bits: difference between encoded width and visible width * - lower 4bits: difference between encoded height and visible height * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "libavutil/avstring.h" +#include "libavutil/dict.h" +#include "libavutil/opt.h" +#include "libavutil/intfloat.h" +#include "libavutil/mathematics.h" #include "libavcodec/bytestream.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" +#include "internal.h" +#include "avio_internal.h" #include "flv.h" +#define KEYFRAMES_TAG "keyframes" +#define KEYFRAMES_TIMESTAMP_TAG "times" +#define KEYFRAMES_BYTEOFFSET_TAG "filepositions" + +#define VALIDATE_INDEX_TS_THRESH 2500 + typedef struct { + const AVClass *class; ///< Class for private options. + int trust_metadata; ///< configure streams according onMetaData int wrong_dts; ///< wrong dts due to negative cts + uint8_t *new_extradata[2]; + int new_extradata_size[2]; + int last_sample_rate; + int last_channels; + struct { + int64_t dts; + int64_t pos; + } validate_index[2]; + int validate_next; + int validate_count; } FLVContext; static int flv_probe(AVProbeData *p) @@ -45,31 +69,103 @@ static int flv_probe(AVProbeData *p) return 0; } -static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_codecid) { - AVCodecContext *acodec = astream->codec; +static AVStream *create_stream(AVFormatContext *s, int codec_type) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return NULL; + st->codec->codec_type = codec_type; + avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */ + return st; +} +static int flv_same_audio_codec(AVCodecContext *acodec, int flags) +{ + int bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; + int flv_codecid = flags & FLV_AUDIO_CODECID_MASK; + int codec_id; + + if (!acodec->codec_id && !acodec->codec_tag) + return 1; + + if (acodec->bits_per_coded_sample != bits_per_coded_sample) + return 0; + + switch(flv_codecid) { + //no distinction between S16 and S8 PCM codec flags + case FLV_CODECID_PCM: + codec_id = bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : +#if HAVE_BIGENDIAN + AV_CODEC_ID_PCM_S16BE; +#else + AV_CODEC_ID_PCM_S16LE; +#endif + return codec_id == acodec->codec_id; + case FLV_CODECID_PCM_LE: + codec_id = bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : AV_CODEC_ID_PCM_S16LE; + return codec_id == acodec->codec_id; + case FLV_CODECID_AAC: + return acodec->codec_id == AV_CODEC_ID_AAC; + case FLV_CODECID_ADPCM: + return acodec->codec_id == AV_CODEC_ID_ADPCM_SWF; + case FLV_CODECID_SPEEX: + return acodec->codec_id == AV_CODEC_ID_SPEEX; + case FLV_CODECID_MP3: + return acodec->codec_id == AV_CODEC_ID_MP3; + case FLV_CODECID_NELLYMOSER_8KHZ_MONO: + case FLV_CODECID_NELLYMOSER_16KHZ_MONO: + case FLV_CODECID_NELLYMOSER: + return acodec->codec_id == AV_CODEC_ID_NELLYMOSER; + case FLV_CODECID_PCM_MULAW: + return acodec->sample_rate == 8000 && + acodec->codec_id == AV_CODEC_ID_PCM_MULAW; + case FLV_CODECID_PCM_ALAW: + return acodec->sample_rate = 8000 && + acodec->codec_id == AV_CODEC_ID_PCM_ALAW; + default: + return acodec->codec_tag == (flv_codecid >> FLV_AUDIO_CODECID_OFFSET); + } + + return 0; +} + +static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, AVCodecContext *acodec, int flv_codecid) { switch(flv_codecid) { //no distinction between S16 and S8 PCM codec flags case FLV_CODECID_PCM: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : #if HAVE_BIGENDIAN - CODEC_ID_PCM_S16BE; + AV_CODEC_ID_PCM_S16BE; #else - CODEC_ID_PCM_S16LE; + AV_CODEC_ID_PCM_S16LE; #endif break; case FLV_CODECID_PCM_LE: - acodec->codec_id = acodec->bits_per_coded_sample == 8 ? CODEC_ID_PCM_U8 : 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; + acodec->codec_id = acodec->bits_per_coded_sample == 8 ? AV_CODEC_ID_PCM_U8 : AV_CODEC_ID_PCM_S16LE; break; + case FLV_CODECID_AAC : acodec->codec_id = AV_CODEC_ID_AAC; break; + case FLV_CODECID_ADPCM: acodec->codec_id = AV_CODEC_ID_ADPCM_SWF; break; case FLV_CODECID_SPEEX: - acodec->codec_id = CODEC_ID_SPEEX; + acodec->codec_id = AV_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_MP3 : acodec->codec_id = AV_CODEC_ID_MP3 ; astream->need_parsing = AVSTREAM_PARSE_FULL; break; case FLV_CODECID_NELLYMOSER_8KHZ_MONO: acodec->sample_rate = 8000; //in case metadata does not otherwise declare samplerate + acodec->codec_id = AV_CODEC_ID_NELLYMOSER; + break; + case FLV_CODECID_NELLYMOSER_16KHZ_MONO: + acodec->sample_rate = 16000; + acodec->codec_id = AV_CODEC_ID_NELLYMOSER; + break; case FLV_CODECID_NELLYMOSER: - acodec->codec_id = CODEC_ID_NELLYMOSER; + acodec->codec_id = AV_CODEC_ID_NELLYMOSER; + break; + case FLV_CODECID_PCM_MULAW: + acodec->sample_rate = 8000; + acodec->codec_id = AV_CODEC_ID_PCM_MULAW; + break; + case FLV_CODECID_PCM_ALAW: + acodec->sample_rate = 8000; + acodec->codec_id = AV_CODEC_ID_PCM_ALAW; break; default: av_log(s, AV_LOG_INFO, "Unsupported audio codec (%x)\n", flv_codecid >> FLV_AUDIO_CODECID_OFFSET); @@ -77,24 +173,51 @@ static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, int flv_c } } +static int flv_same_video_codec(AVCodecContext *vcodec, int flags) +{ + int flv_codecid = flags & FLV_VIDEO_CODECID_MASK; + + if (!vcodec->codec_id && !vcodec->codec_tag) + return 1; + + switch (flv_codecid) { + case FLV_CODECID_H263: + return vcodec->codec_id == AV_CODEC_ID_FLV1; + case FLV_CODECID_SCREEN: + return vcodec->codec_id == AV_CODEC_ID_FLASHSV; + case FLV_CODECID_SCREEN2: + return vcodec->codec_id == AV_CODEC_ID_FLASHSV2; + case FLV_CODECID_VP6: + return vcodec->codec_id == AV_CODEC_ID_VP6F; + case FLV_CODECID_VP6A: + return vcodec->codec_id == AV_CODEC_ID_VP6A; + case FLV_CODECID_H264: + return vcodec->codec_id == AV_CODEC_ID_H264; + default: + return vcodec->codec_tag == flv_codecid; + } + + return 0; +} + static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int flv_codecid) { 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_SCREEN2: vcodec->codec_id = CODEC_ID_FLASHSV2; break; - case FLV_CODECID_VP6 : vcodec->codec_id = CODEC_ID_VP6F ; + case FLV_CODECID_H263 : vcodec->codec_id = AV_CODEC_ID_FLV1 ; break; + case FLV_CODECID_SCREEN: vcodec->codec_id = AV_CODEC_ID_FLASHSV; break; + case FLV_CODECID_SCREEN2: vcodec->codec_id = AV_CODEC_ID_FLASHSV2; break; + case FLV_CODECID_VP6 : vcodec->codec_id = AV_CODEC_ID_VP6F ; case FLV_CODECID_VP6A : if(flv_codecid == FLV_CODECID_VP6A) - vcodec->codec_id = CODEC_ID_VP6A; + vcodec->codec_id = AV_CODEC_ID_VP6A; if(vcodec->extradata_size != 1) { vcodec->extradata_size = 1; vcodec->extradata = av_malloc(1); } - vcodec->extradata[0] = get_byte(s->pb); + vcodec->extradata[0] = avio_r8(s->pb); return 1; // 1 byte body size adjustment for flv_read_packet() case FLV_CODECID_H264: - vcodec->codec_id = CODEC_ID_H264; + vcodec->codec_id = AV_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); @@ -104,23 +227,106 @@ 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); +static int amf_get_string(AVIOContext *ioc, char *buffer, int buffsize) { + int length = avio_rb16(ioc); if(length >= buffsize) { - url_fskip(ioc, length); + avio_skip(ioc, length); return -1; } - get_buffer(ioc, buffer, length); + avio_read(ioc, buffer, length); buffer[length] = '\0'; return length; } +static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream *vstream, int64_t max_pos) { + FLVContext *flv = s->priv_data; + unsigned int arraylen = 0, timeslen = 0, fileposlen = 0, i; + double num_val; + char str_val[256]; + int64_t *times = NULL; + int64_t *filepositions = NULL; + int ret = AVERROR(ENOSYS); + int64_t initial_pos = avio_tell(ioc); + + if (s->flags & AVFMT_FLAG_IGNIDX) + return 0; + + while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { + int64_t* current_array; + + // Expect array object in context + if (avio_r8(ioc) != AMF_DATA_TYPE_ARRAY) + break; + + arraylen = avio_rb32(ioc); + if (arraylen >> 28) + break; + + /* + * Expect only 'times' or 'filepositions' sub-arrays in other case refuse to use such metadata + * for indexing + */ + if (!strcmp(KEYFRAMES_TIMESTAMP_TAG, str_val) && !times) { + if (!(times = av_mallocz(sizeof(*times) * arraylen))) { + ret = AVERROR(ENOMEM); + goto finish; + } + timeslen = arraylen; + current_array = times; + } else if (!strcmp(KEYFRAMES_BYTEOFFSET_TAG, str_val) && !filepositions) { + if (!(filepositions = av_mallocz(sizeof(*filepositions) * arraylen))) { + ret = AVERROR(ENOMEM); + goto finish; + } + fileposlen = arraylen; + current_array = filepositions; + } else // unexpected metatag inside keyframes, will not use such metadata for indexing + break; + + for (i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++) { + if (avio_r8(ioc) != AMF_DATA_TYPE_NUMBER) + goto finish; + num_val = av_int2double(avio_rb64(ioc)); + current_array[i] = num_val; + } + if (times && filepositions) { + // All done, exiting at a position allowing amf_parse_object + // to finish parsing the object + ret = 0; + break; + } + } + + if (!ret && timeslen == fileposlen) { + for (i = 0; i < fileposlen; i++) { + av_add_index_entry(vstream, filepositions[i], times[i]*1000, + 0, 0, AVINDEX_KEYFRAME); + if (i < 2) { + flv->validate_index[i].pos = filepositions[i]; + flv->validate_index[i].dts = times[i] * 1000; + flv->validate_count = i + 1; + } + } + } else + av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n"); + +finish: + av_freep(×); + av_freep(&filepositions); + // If we got unexpected data, but successfully reset back to + // the start pos, the caller can continue parsing + if (ret < 0 && avio_seek(ioc, initial_pos, SEEK_SET) > 0) + return 0; + return ret; +} + 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; + FLVContext *flv = s->priv_data; + AVIOContext *ioc; AMFDataType amf_type; char str_val[256]; double num_val; @@ -128,55 +334,56 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst num_val = 0; ioc = s->pb; - amf_type = get_byte(ioc); + amf_type = avio_r8(ioc); switch(amf_type) { case AMF_DATA_TYPE_NUMBER: - num_val = av_int2dbl(get_be64(ioc)); break; + num_val = av_int2double(avio_rb64(ioc)); break; case AMF_DATA_TYPE_BOOL: - num_val = get_byte(ioc); break; + num_val = avio_r8(ioc); break; case AMF_DATA_TYPE_STRING: if(amf_get_string(ioc, str_val, sizeof(str_val)) < 0) return -1; break; - case AMF_DATA_TYPE_OBJECT: { - unsigned int keylen; + case AMF_DATA_TYPE_OBJECT: + if ((vstream || astream) && key && !strcmp(KEYFRAMES_TAG, key) && depth == 1) + if (parse_keyframes_index(s, ioc, vstream ? vstream : astream, + max_pos) < 0) + return -1; - while(url_ftell(ioc) < max_pos - 2 && (keylen = get_be16(ioc))) { - url_fskip(ioc, keylen); //skip key string - if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) + while (avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 0) { + if (amf_parse_object(s, astream, vstream, str_val, max_pos, depth + 1) < 0) return -1; //if we couldn't skip, bomb out. } - if(get_byte(ioc) != AMF_END_OF_OBJECT) + if(avio_r8(ioc) != AMF_END_OF_OBJECT) return -1; - } break; case AMF_DATA_TYPE_NULL: case AMF_DATA_TYPE_UNDEFINED: case AMF_DATA_TYPE_UNSUPPORTED: 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) { + avio_skip(ioc, 4); //skip 32-bit max array index + while(avio_tell(ioc) < max_pos - 2 && amf_get_string(ioc, str_val, sizeof(str_val)) > 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) return -1; } - if(get_byte(ioc) != AMF_END_OF_OBJECT) + if(avio_r8(ioc) != AMF_END_OF_OBJECT) return -1; break; case AMF_DATA_TYPE_ARRAY: { unsigned int arraylen, i; - arraylen = get_be32(ioc); - for(i = 0; i < arraylen && url_ftell(ioc) < max_pos - 1; i++) { + arraylen = avio_rb32(ioc); + for(i = 0; i < arraylen && avio_tell(ioc) < max_pos - 1; i++) { if(amf_parse_object(s, NULL, NULL, NULL, max_pos, depth + 1) < 0) return -1; //if we couldn't skip, bomb out. } } break; case AMF_DATA_TYPE_DATE: - url_fskip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16) + avio_skip(ioc, 8 + 2); //timestamp (double) and UTC offset (int16) break; default: //unsupported type, we couldn't skip return -1; @@ -186,19 +393,59 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst acodec = astream ? astream->codec : NULL; vcodec = vstream ? vstream->codec : NULL; + if (amf_type == AMF_DATA_TYPE_NUMBER) { + if (!strcmp(key, "duration")) + s->duration = num_val * AV_TIME_BASE; + else if (!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0)) + vcodec->bit_rate = num_val * 1024.0; + else if (!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0)) + acodec->bit_rate = num_val * 1024.0; + else if (!strcmp(key, "datastream")) { + AVStream *st = create_stream(s, AVMEDIA_TYPE_DATA); + if (!st) + return AVERROR(ENOMEM); + st->codec->codec_id = AV_CODEC_ID_TEXT; + } else if (flv->trust_metadata) { + if (!strcmp(key, "videocodecid") && vcodec) { + flv_set_video_codec(s, vstream, num_val); + } else + if (!strcmp(key, "audiocodecid") && acodec) { + flv_set_audio_codec(s, astream, acodec, num_val); + } else + if (!strcmp(key, "audiosamplerate") && acodec) { + acodec->sample_rate = num_val; + } else + if (!strcmp(key, "width") && vcodec) { + vcodec->width = num_val; + } else + if (!strcmp(key, "height") && vcodec) { + vcodec->height = num_val; + } + } + } + + if (!strcmp(key, "duration") || + !strcmp(key, "filesize") || + !strcmp(key, "width") || + !strcmp(key, "height") || + !strcmp(key, "videodatarate") || + !strcmp(key, "framerate") || + !strcmp(key, "videocodecid") || + !strcmp(key, "audiodatarate") || + !strcmp(key, "audiosamplerate") || + !strcmp(key, "audiosamplesize") || + !strcmp(key, "stereo") || + !strcmp(key, "audiocodecid")) + return 0; + if(amf_type == AMF_DATA_TYPE_BOOL) { av_strlcpy(str_val, num_val > 0 ? "true" : "false", sizeof(str_val)); - av_metadata_set2(&s->metadata, key, str_val, 0); + av_dict_set(&s->metadata, key, str_val, 0); } else if(amf_type == AMF_DATA_TYPE_NUMBER) { snprintf(str_val, sizeof(str_val), "%.f", num_val); - av_metadata_set2(&s->metadata, key, str_val, 0); - if(!strcmp(key, "duration")) s->duration = num_val * AV_TIME_BASE; - else if(!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0)) - vcodec->bit_rate = num_val * 1024.0; - else if(!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0)) - acodec->bit_rate = num_val * 1024.0; + av_dict_set(&s->metadata, key, str_val, 0); } else if (amf_type == AMF_DATA_TYPE_STRING) - av_metadata_set2(&s->metadata, key, str_val, 0); + av_dict_set(&s->metadata, key, str_val, 0); } return 0; @@ -207,7 +454,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { AMFDataType type; AVStream *stream, *astream, *vstream; - ByteIOContext *ioc; + AVIOContext *ioc; int i; char buffer[11]; //only needs to hold the string "onMetaData". Anything longer is something we don't want. @@ -216,8 +463,15 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos) { 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")) + type = avio_r8(ioc); + if (type != AMF_DATA_TYPE_STRING || + amf_get_string(ioc, buffer, sizeof(buffer)) < 0) + return -1; + + if (!strcmp(buffer, "onTextData")) + return 1; + + if (strcmp(buffer, "onMetaData")) return -1; //find the streams now so that amf_parse_object doesn't need to do the lookup every time it is called. @@ -234,22 +488,12 @@ static int flv_read_metabody(AVFormatContext *s, int64_t 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 ? AVMEDIA_TYPE_AUDIO : AVMEDIA_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) +static int flv_read_header(AVFormatContext *s) { int offset, flags; - url_fskip(s->pb, 4); - flags = get_byte(s->pb); + avio_skip(s->pb, 4); + flags = avio_r8(s->pb); /* old flvtool cleared this field */ /* FIXME: better fix needed */ if (!flags) { @@ -262,23 +506,31 @@ static int flv_read_header(AVFormatContext *s, s->ctx_flags |= AVFMTCTX_NOHEADER; if(flags & FLV_HEADER_FLAG_HASVIDEO){ - if(!create_stream(s, 0)) + if(!create_stream(s, AVMEDIA_TYPE_VIDEO)) return AVERROR(ENOMEM); } if(flags & FLV_HEADER_FLAG_HASAUDIO){ - if(!create_stream(s, 1)) + if(!create_stream(s, AVMEDIA_TYPE_AUDIO)) return AVERROR(ENOMEM); } - offset = get_be32(s->pb); - url_fseek(s->pb, offset, SEEK_SET); - url_fskip(s->pb, 4); + offset = avio_rb32(s->pb); + avio_seek(s->pb, offset, SEEK_SET); + avio_skip(s->pb, 4); s->start_time = 0; return 0; } +static int flv_read_close(AVFormatContext *s) +{ + FLVContext *flv = s->priv_data; + av_freep(&flv->new_extradata[0]); + av_freep(&flv->new_extradata[1]); + return 0; +} + static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size) { av_free(st->codec->extradata); @@ -286,52 +538,158 @@ static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size) if (!st->codec->extradata) return AVERROR(ENOMEM); st->codec->extradata_size = size; - get_buffer(s->pb, st->codec->extradata, st->codec->extradata_size); + avio_read(s->pb, st->codec->extradata, st->codec->extradata_size); + return 0; +} + +static int flv_queue_extradata(FLVContext *flv, AVIOContext *pb, int stream, + int size) +{ + av_free(flv->new_extradata[stream]); + flv->new_extradata[stream] = av_mallocz(size + FF_INPUT_BUFFER_PADDING_SIZE); + if (!flv->new_extradata[stream]) + return AVERROR(ENOMEM); + flv->new_extradata_size[stream] = size; + avio_read(pb, flv->new_extradata[stream], size); return 0; } +static void clear_index_entries(AVFormatContext *s, int64_t pos) +{ + int i, j, out; + av_log(s, AV_LOG_WARNING, "Found invalid index entries, clearing the index.\n"); + for (i = 0; i < s->nb_streams; i++) { + AVStream *st = s->streams[i]; + /* Remove all index entries that point to >= pos */ + out = 0; + for (j = 0; j < st->nb_index_entries; j++) { + if (st->index_entries[j].pos < pos) + st->index_entries[out++] = st->index_entries[j]; + } + st->nb_index_entries = out; + } +} + + +static int flv_data_packet(AVFormatContext *s, AVPacket *pkt, + int64_t dts, int64_t next) +{ + int ret = AVERROR_INVALIDDATA, i; + AVIOContext *pb = s->pb; + AVStream *st = NULL; + AMFDataType type; + char buf[20]; + int length; + + type = avio_r8(pb); + if (type == AMF_DATA_TYPE_MIXEDARRAY) + avio_seek(pb, 4, SEEK_CUR); + else if (type != AMF_DATA_TYPE_OBJECT) + goto out; + + amf_get_string(pb, buf, sizeof(buf)); + if (strcmp(buf, "type") || avio_r8(pb) != AMF_DATA_TYPE_STRING) + goto out; + + amf_get_string(pb, buf, sizeof(buf)); + //FIXME parse it as codec_id + amf_get_string(pb, buf, sizeof(buf)); + if (strcmp(buf, "text") || avio_r8(pb) != AMF_DATA_TYPE_STRING) + goto out; + + length = avio_rb16(pb); + ret = av_get_packet(s->pb, pkt, length); + if (ret < 0) { + ret = AVERROR(EIO); + goto out; + } + + for (i = 0; i < s->nb_streams; i++) { + st = s->streams[i]; + if (st->codec->codec_type == AVMEDIA_TYPE_DATA) + break; + } + + if (i == s->nb_streams) { + st = create_stream(s, AVMEDIA_TYPE_DATA); + if (!st) + goto out; + st->codec->codec_id = AV_CODEC_ID_TEXT; + } + + pkt->dts = dts; + pkt->pts = dts; + pkt->size = ret; + + pkt->stream_index = st->index; + pkt->flags |= AV_PKT_FLAG_KEY; + + avio_seek(s->pb, next + 4, SEEK_SET); +out: + return ret; +} + static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) { FLVContext *flv = s->priv_data; int ret, i, type, size, flags, is_audio; int64_t next, pos; int64_t dts, pts = AV_NOPTS_VALUE; + int sample_rate = 0, channels = 0; AVStream *st = NULL; - for(;;url_fskip(s->pb, 4)){ /* pkt size is repeated at end. skip it */ - pos = url_ftell(s->pb); - 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)) + for(;;avio_skip(s->pb, 4)){ /* pkt size is repeated at end. skip it */ + pos = avio_tell(s->pb); + type = avio_r8(s->pb); + size = avio_rb24(s->pb); + dts = avio_rb24(s->pb); + dts |= avio_r8(s->pb) << 24; + av_dlog(s, "type:%d, size:%d, dts:%"PRId64"\n", type, size, dts); + if (s->pb->eof_reached) return AVERROR_EOF; - url_fskip(s->pb, 3); /* stream id, always 0 */ + avio_skip(s->pb, 3); /* stream id, always 0 */ flags = 0; + if (flv->validate_next < flv->validate_count) { + int64_t validate_pos = flv->validate_index[flv->validate_next].pos; + if (pos == validate_pos) { + if (FFABS(dts - flv->validate_index[flv->validate_next].dts) <= + VALIDATE_INDEX_TS_THRESH) { + flv->validate_next++; + } else { + clear_index_entries(s, validate_pos); + flv->validate_count = 0; + } + } else if (pos > validate_pos) { + clear_index_entries(s, validate_pos); + flv->validate_count = 0; + } + } + if(size == 0) continue; - next= size + url_ftell(s->pb); + next= size + avio_tell(s->pb); if (type == FLV_TAG_TYPE_AUDIO) { is_audio=1; - flags = get_byte(s->pb); + flags = avio_r8(s->pb); size--; } else if (type == FLV_TAG_TYPE_VIDEO) { is_audio=0; - flags = get_byte(s->pb); + flags = avio_r8(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); + if (flv_read_metabody(s, next) > 0) { + return flv_data_packet(s, pkt, dts, next); + } else /* skip packet */ 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); + avio_seek(s->pb, next, SEEK_SET); continue; } @@ -342,20 +700,28 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) /* now find stream */ for(i=0;inb_streams;i++) { st = s->streams[i]; - if (st->id == is_audio) - break; + if (is_audio && st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { + if (flv_same_audio_codec(st->codec, flags)) { + break; + } + } else + if (!is_audio && st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { + if (flv_same_video_codec(st->codec, flags)) { + break; + } + } } if(i == s->nb_streams){ - av_log(s, AV_LOG_ERROR, "invalid stream\n"); - st= create_stream(s, is_audio); + st = create_stream(s, + is_audio ? AVMEDIA_TYPE_AUDIO : AVMEDIA_TYPE_VIDEO); s->ctx_flags &= ~AVFMTCTX_NOHEADER; } -// av_log(s, AV_LOG_DEBUG, "%d %X %d \n", is_audio, flags, st->discard); + av_dlog(s, "%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); + avio_seek(s->pb, next, SEEK_SET); continue; } if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) @@ -364,40 +730,51 @@ 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 || s->duration==AV_NOPTS_VALUE)){ + if(s->pb->seekable && (!s->duration || s->duration==AV_NOPTS_VALUE)){ int size; - 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){ - uint32_t ts = get_be24(s->pb); - ts |= get_byte(s->pb) << 24; + const int64_t pos= avio_tell(s->pb); + const int64_t fsize= avio_size(s->pb); + avio_seek(s->pb, fsize-4, SEEK_SET); + size= avio_rb32(s->pb); + avio_seek(s->pb, fsize-3-size, SEEK_SET); + if(size == avio_rb24(s->pb) + 11){ + uint32_t ts = avio_rb24(s->pb); + ts |= avio_r8(s->pb) << 24; s->duration = ts * (int64_t)AV_TIME_BASE / 1000; } - url_fseek(s->pb, pos, SEEK_SET); + avio_seek(s->pb, pos, SEEK_SET); } if(is_audio){ + int bits_per_coded_sample; + channels = (flags & FLV_AUDIO_CHANNEL_MASK) == FLV_STEREO ? 2 : 1; + sample_rate = (44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3); + bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; 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; - 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; + st->codec->channels = channels; + st->codec->sample_rate = sample_rate; + st->codec->bits_per_coded_sample = bits_per_coded_sample; } if(!st->codec->codec_id){ - flv_set_audio_codec(s, st, flags & FLV_AUDIO_CODECID_MASK); + flv_set_audio_codec(s, st, st->codec, flags & FLV_AUDIO_CODECID_MASK); + flv->last_sample_rate = sample_rate = st->codec->sample_rate; + flv->last_channels = channels = st->codec->channels; + } else { + AVCodecContext ctx; + ctx.sample_rate = sample_rate; + flv_set_audio_codec(s, st, &ctx, flags & FLV_AUDIO_CODECID_MASK); + sample_rate = ctx.sample_rate; } }else{ size -= flv_set_video_codec(s, st, flags & FLV_VIDEO_CODECID_MASK); } - if (st->codec->codec_id == CODEC_ID_AAC || - st->codec->codec_id == CODEC_ID_H264) { - int type = get_byte(s->pb); + if (st->codec->codec_id == AV_CODEC_ID_AAC || + st->codec->codec_id == AV_CODEC_ID_H264) { + int type = avio_r8(s->pb); size--; - if (st->codec->codec_id == CODEC_ID_H264) { - int32_t cts = (get_be24(s->pb)+0xff800000)^0xff800000; // sign extension + if (st->codec->codec_id == AV_CODEC_ID_H264) { + int32_t cts = (avio_rb24(s->pb)+0xff800000)^0xff800000; // sign extension pts = dts + cts; if (cts < 0) { // dts are wrong flv->wrong_dts = 1; @@ -407,15 +784,24 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) dts = AV_NOPTS_VALUE; } if (type == 0) { + if (st->codec->extradata) { + if ((ret = flv_queue_extradata(flv, s->pb, is_audio, size)) < 0) + return ret; + ret = AVERROR(EAGAIN); + goto leave; + } if ((ret = flv_get_extradata(s, st, size)) < 0) return ret; - if (st->codec->codec_id == CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) { MPEG4AudioConfig cfg; - ff_mpeg4audio_get_config(&cfg, st->codec->extradata, - st->codec->extradata_size); + avpriv_mpeg4audio_get_config(&cfg, st->codec->extradata, + st->codec->extradata_size * 8, 1); st->codec->channels = cfg.channels; - st->codec->sample_rate = cfg.sample_rate; - dprintf(s, "mp4a config channels %d sample rate %d\n", + if (cfg.ext_sample_rate) + st->codec->sample_rate = cfg.ext_sample_rate; + else + st->codec->sample_rate = cfg.sample_rate; + av_dlog(s, "mp4a config channels %d sample rate %d\n", st->codec->channels, st->codec->sample_rate); } @@ -440,59 +826,62 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->dts = dts; pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts; pkt->stream_index = st->index; + if (flv->new_extradata[is_audio]) { + uint8_t *side = av_packet_new_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + flv->new_extradata_size[is_audio]); + if (side) { + memcpy(side, flv->new_extradata[is_audio], + flv->new_extradata_size[is_audio]); + av_freep(&flv->new_extradata[is_audio]); + flv->new_extradata_size[is_audio] = 0; + } + } + if (is_audio && (sample_rate != flv->last_sample_rate || + channels != flv->last_channels)) { + flv->last_sample_rate = sample_rate; + flv->last_channels = channels; + ff_add_param_change(pkt, channels, 0, sample_rate, 0, 0); + } if (is_audio || ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY)) pkt->flags |= AV_PKT_FLAG_KEY; leave: - url_fskip(s->pb, 4); + avio_skip(s->pb, 4); return ret; } static int flv_read_seek(AVFormatContext *s, int stream_index, int64_t ts, int flags) { - return av_url_read_fseek(s->pb, stream_index, ts, flags); + FLVContext *flv = s->priv_data; + flv->validate_count = 0; + return avio_seek_time(s->pb, stream_index, ts, flags); } -#if 0 /* don't know enough to implement this */ -static int flv_read_seek2(AVFormatContext *s, int stream_index, - int64_t min_ts, int64_t ts, int64_t max_ts, int flags) -{ - int ret = AVERROR(ENOSYS); - - if (ts - min_ts > (uint64_t)(max_ts - ts)) flags |= AVSEEK_FLAG_BACKWARD; - - if (url_is_streamed(s->pb)) { - if (stream_index < 0) { - stream_index = av_find_default_stream_index(s); - if (stream_index < 0) - return -1; - - /* timestamp for default must be expressed in AV_TIME_BASE units */ - ts = av_rescale_rnd(ts, 1000, AV_TIME_BASE, - flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP); - } - ret = av_url_read_fseek(s->pb, stream_index, ts, flags); - } +#define OFFSET(x) offsetof(FLVContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM +static const AVOption options[] = { + { "flv_metadata", "Allocate streams according the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VD}, + { NULL } +}; - if (ret == AVERROR(ENOSYS)) - ret = av_seek_frame(s, stream_index, ts, flags); - return ret; -} -#endif +static const AVClass class = { + .class_name = "flvdec", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; -AVInputFormat flv_demuxer = { - "flv", - NULL_IF_CONFIG_SMALL("FLV format"), - sizeof(FLVContext), - flv_probe, - flv_read_header, - flv_read_packet, - .read_seek = flv_read_seek, -#if 0 - .read_seek2 = flv_read_seek2, -#endif - .extensions = "flv", - .value = CODEC_ID_FLV1, +AVInputFormat ff_flv_demuxer = { + .name = "flv", + .long_name = NULL_IF_CONFIG_SMALL("FLV (Flash Video)"), + .priv_data_size = sizeof(FLVContext), + .read_probe = flv_probe, + .read_header = flv_read_header, + .read_packet = flv_read_packet, + .read_seek = flv_read_seek, + .read_close = flv_read_close, + .extensions = "flv", + .priv_class = &class, };