mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
lavf/flvdec: added support for KUX container
Fixes ticket #4519. The metadata starting at 0xe00004 is encrypted with the password "meta" but zlib does not support decryption, so no kux metadata is read.
This commit is contained in:
parent
f4f40cbb57
commit
208ae228fa
@ -21,6 +21,7 @@ version <next>:
|
||||
- Support decoding of HEVC 4:4:4 content in nvdec and cuviddec
|
||||
- removed libndi-newtek
|
||||
- agm decoder
|
||||
- KUX demuxer
|
||||
|
||||
|
||||
version 4.1:
|
||||
|
@ -210,6 +210,7 @@ extern AVInputFormat ff_ivr_demuxer;
|
||||
extern AVInputFormat ff_jacosub_demuxer;
|
||||
extern AVOutputFormat ff_jacosub_muxer;
|
||||
extern AVInputFormat ff_jv_demuxer;
|
||||
extern AVInputFormat ff_kux_demuxer;
|
||||
extern AVOutputFormat ff_latm_muxer;
|
||||
extern AVInputFormat ff_lmlm4_demuxer;
|
||||
extern AVInputFormat ff_loas_demuxer;
|
||||
|
@ -113,6 +113,20 @@ static int live_flv_probe(const AVProbeData *p)
|
||||
return probe(p, 1);
|
||||
}
|
||||
|
||||
static int kux_probe(const AVProbeData *p)
|
||||
{
|
||||
const uint8_t *d = p->buf;
|
||||
|
||||
if (d[0] == 'K' &&
|
||||
d[1] == 'D' &&
|
||||
d[2] == 'K' &&
|
||||
d[3] == 0 &&
|
||||
d[4] == 0) {
|
||||
return AVPROBE_SCORE_EXTENSION + 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void add_keyframes_index(AVFormatContext *s)
|
||||
{
|
||||
FLVContext *flv = s->priv_data;
|
||||
@ -738,6 +752,10 @@ static int flv_read_header(AVFormatContext *s)
|
||||
int offset;
|
||||
int pre_tag_size = 0;
|
||||
|
||||
/* Actual FLV data at 0xe40000 in KUX file */
|
||||
if(!strcmp(s->iformat->name, "kux"))
|
||||
avio_skip(s->pb, 0xe40000);
|
||||
|
||||
avio_skip(s->pb, 4);
|
||||
flags = avio_r8(s->pb);
|
||||
|
||||
@ -1386,3 +1404,23 @@ AVInputFormat ff_live_flv_demuxer = {
|
||||
.priv_class = &live_flv_class,
|
||||
.flags = AVFMT_TS_DISCONT
|
||||
};
|
||||
|
||||
static const AVClass kux_class = {
|
||||
.class_name = "kuxdec",
|
||||
.item_name = av_default_item_name,
|
||||
.option = options,
|
||||
.version = LIBAVUTIL_VERSION_INT,
|
||||
};
|
||||
|
||||
AVInputFormat ff_kux_demuxer = {
|
||||
.name = "kux",
|
||||
.long_name = NULL_IF_CONFIG_SMALL("KUX (YouKu)"),
|
||||
.priv_data_size = sizeof(FLVContext),
|
||||
.read_probe = kux_probe,
|
||||
.read_header = flv_read_header,
|
||||
.read_packet = flv_read_packet,
|
||||
.read_seek = flv_read_seek,
|
||||
.read_close = flv_read_close,
|
||||
.extensions = "kux",
|
||||
.priv_class = &kux_class,
|
||||
};
|
||||
|
@ -32,8 +32,8 @@
|
||||
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
||||
// Also please add any ticket numbers that you believe might be affected here
|
||||
#define LIBAVFORMAT_VERSION_MAJOR 58
|
||||
#define LIBAVFORMAT_VERSION_MINOR 26
|
||||
#define LIBAVFORMAT_VERSION_MICRO 101
|
||||
#define LIBAVFORMAT_VERSION_MINOR 27
|
||||
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||
|
||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||
LIBAVFORMAT_VERSION_MINOR, \
|
||||
|
Loading…
Reference in New Issue
Block a user