eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flvdec: optionally trust the metadata

Browse source 
In certain conditions video or audio frames might appear way later in the
stream.
This commit is contained in:
Luca Barbato 2012-07-04 13:33:41 +02:00
parent 715129cdc4
commit 5b54a90c8b
1 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

35
libavformat/flvdec.c
View file

@ -26,6 +26,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/opt.h"
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
@ -42,6 +43,8 @@
#define VALIDATE_INDEX_TS_THRESH 2500 #define VALIDATE_INDEX_TS_THRESH 2500
typedef struct { 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 int wrong_dts; ///< wrong dts due to negative cts
uint8_t *new_extradata[2]; uint8_t *new_extradata[2];
int new_extradata_size[2]; int new_extradata_size[2];
@ -327,6 +330,7 @@ finish:
static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vstream, const char *key, int64_t 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; AVCodecContext *acodec, *vcodec;
FLVContext *flv = s->priv_data;
AVIOContext *ioc; AVIOContext *ioc;
AMFDataType amf_type; AMFDataType amf_type;
char str_val[256]; char str_val[256];
@ -406,6 +410,22 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
st->codec->codec_id = CODEC_ID_TEXT; st->codec->codec_id = 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;
}
} }
} }
@ -844,6 +864,20 @@ static int flv_read_seek(AVFormatContext *s, int stream_index,
return avio_seek_time(s->pb, stream_index, ts, flags); return avio_seek_time(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, { 0 }, 0, 1, VD},
{ NULL }
};
static const AVClass class = {
.class_name = "flvdec",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVInputFormat ff_flv_demuxer = { AVInputFormat ff_flv_demuxer = {
.name = "flv", .name = "flv",
.long_name = NULL_IF_CONFIG_SMALL("FLV format"), .long_name = NULL_IF_CONFIG_SMALL("FLV format"),
@ -854,4 +888,5 @@ AVInputFormat ff_flv_demuxer = {
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "flv", .extensions = "flv",
.priv_class = &class,
}; };