diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-01-11 13:23:13 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2017-01-11 18:27:00 +0100 |
| commit | f55da2200dbf98311969e0f345edbc82177d4836 (patch) | |
| tree | a8721aef6f042ebb1329353a6a035f3e673f6c70 /libavformat/dss.c | |
| parent | 14b9060160e453398d01ca767c0f8ace9fb4b5e3 (diff) | |
lavf/dss: Support version 3 files / files with larger header.
Fixes ticket #6072.
Diffstat (limited to 'libavformat/dss.c')
| -rw-r--r-- | libavformat/dss.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libavformat/dss.c b/libavformat/dss.c index 2f7f20d134..cbf6e17dee 100644 --- a/libavformat/dss.c +++ b/libavformat/dss.c @@ -42,7 +42,6 @@ #define DSS_COMMENT_SIZE 64 #define DSS_BLOCK_SIZE 512 -#define DSS_HEADER_SIZE (DSS_BLOCK_SIZE * 2) #define DSS_AUDIO_BLOCK_HEADER_SIZE 6 #define DSS_FRAME_SIZE 42 @@ -56,11 +55,13 @@ typedef struct DSSDemuxContext { int8_t *dss_sp_buf; int packet_size; + int dss_header_size; } DSSDemuxContext; static int dss_probe(AVProbeData *p) { - if (AV_RL32(p->buf) != MKTAG(0x2, 'd', 's', 's')) + if ( AV_RL32(p->buf) != MKTAG(0x2, 'd', 's', 's') + && AV_RL32(p->buf) != MKTAG(0x3, 'd', 's', 's')) return 0; return AVPROBE_SCORE_MAX; @@ -120,12 +121,15 @@ static int dss_read_header(AVFormatContext *s) DSSDemuxContext *ctx = s->priv_data; AVIOContext *pb = s->pb; AVStream *st; - int ret; + int ret, version; st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); + version = avio_r8(pb); + ctx->dss_header_size = version * DSS_BLOCK_SIZE; + ret = dss_read_metadata_string(s, DSS_HEAD_OFFSET_AUTHOR, DSS_AUTHOR_SIZE, "author"); if (ret) @@ -164,7 +168,7 @@ static int dss_read_header(AVFormatContext *s) /* Jump over header */ - if (avio_seek(pb, DSS_HEADER_SIZE, SEEK_SET) != DSS_HEADER_SIZE) + if (avio_seek(pb, ctx->dss_header_size, SEEK_SET) != ctx->dss_header_size) return AVERROR(EIO); ctx->counter = 0; @@ -361,7 +365,7 @@ static int dss_read_seek(AVFormatContext *s, int stream_index, if (seekto < 0) seekto = 0; - seekto += DSS_HEADER_SIZE; + seekto += ctx->dss_header_size; ret = avio_seek(s->pb, seekto, SEEK_SET); if (ret < 0) |