highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/flvdec: Support live flv / NGINX RTMP streams

Browse Source 
Fixes Ticket3553

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-06 05:06:12 +02:00
parent 293d5d7a8e
commit 2fbdfba0f2
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/allformats.c
View File

@ -123,6 +123,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX(FLAC, flac); REGISTER_MUXDEMUX(FLAC, flac);
REGISTER_DEMUXER (FLIC, flic); REGISTER_DEMUXER (FLIC, flic);
REGISTER_MUXDEMUX(FLV, flv); REGISTER_MUXDEMUX(FLV, flv);
REGISTER_DEMUXER (LIVE_FLV, live_flv);
REGISTER_DEMUXER (FOURXM, fourxm); REGISTER_DEMUXER (FOURXM, fourxm);
REGISTER_MUXER (FRAMECRC, framecrc); REGISTER_MUXER (FRAMECRC, framecrc);
REGISTER_MUXER (FRAMEMD5, framemd5); REGISTER_MUXER (FRAMEMD5, framemd5);

45
libavformat/flvdec.c
View File

@ -56,21 +56,35 @@ typedef struct {
int searched_for_end; int searched_for_end;
} FLVContext; } FLVContext;
static int flv_probe(AVProbeData *p) static int probe(AVProbeData *p, int live)
{ {
const uint8_t *d; const uint8_t *d = p->buf;
unsigned offset = AV_RB32(d + 5);
d = p->buf;
if (d[0] == 'F' && if (d[0] == 'F' &&
d[1] == 'L' && d[1] == 'L' &&
d[2] == 'V' && d[2] == 'V' &&
d[3] < 5 && d[5] == 0 && d[3] < 5 && d[5] == 0 &&
AV_RB32(d + 5) > 8) { offset + 100 < p->buf_size &&
return AVPROBE_SCORE_MAX; offset > 8) {
int is_live = !memcmp(d + offset + 40, "NGINX RTMP", 10);
if (live == is_live)
return AVPROBE_SCORE_MAX;
} }
return 0; return 0;
} }
static int flv_probe(AVProbeData *p)
{
return probe(p, 0);
}
static int live_flv_probe(AVProbeData *p)
{
return probe(p, 1);
}
static AVStream *create_stream(AVFormatContext *s, int codec_type) static AVStream *create_stream(AVFormatContext *s, int codec_type)
{ {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
@ -1049,3 +1063,24 @@ AVInputFormat ff_flv_demuxer = {
.extensions = "flv", .extensions = "flv",
.priv_class = &flv_class, .priv_class = &flv_class,
}; };
static const AVClass live_flv_class = {
.class_name = "flvdec",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVInputFormat ff_live_flv_demuxer = {
.name = "live_flv",
.long_name = NULL_IF_CONFIG_SMALL("live RTMP FLV (Flash Video)"),
.priv_data_size = sizeof(FLVContext),
.read_probe = live_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 = &live_flv_class,
.flags = AVFMT_TS_DISCONT
};