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

lavf/dss: Support version 3 files / files with larger header.

Browse Source 
Fixes ticket #6072.
This commit is contained in:
Carl Eugen Hoyos 2017-01-11 13:23:13 +01:00
parent 14b9060160
commit f55da2200d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/dss.c
View File

@ -42,7 +42,6 @@
#define DSS_COMMENT_SIZE 64 #define DSS_COMMENT_SIZE 64
#define DSS_BLOCK_SIZE 512 #define DSS_BLOCK_SIZE 512
#define DSS_HEADER_SIZE (DSS_BLOCK_SIZE * 2)
#define DSS_AUDIO_BLOCK_HEADER_SIZE 6 #define DSS_AUDIO_BLOCK_HEADER_SIZE 6
#define DSS_FRAME_SIZE 42 #define DSS_FRAME_SIZE 42
@ -56,11 +55,13 @@ typedef struct DSSDemuxContext {
int8_t *dss_sp_buf; int8_t *dss_sp_buf;
int packet_size; int packet_size;
int dss_header_size;
} DSSDemuxContext; } DSSDemuxContext;
static int dss_probe(AVProbeData *p) 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 0;
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
@ -120,12 +121,15 @@ static int dss_read_header(AVFormatContext *s)
DSSDemuxContext *ctx = s->priv_data; DSSDemuxContext *ctx = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;
int ret; int ret, version;
st = avformat_new_stream(s, NULL); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); 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, ret = dss_read_metadata_string(s, DSS_HEAD_OFFSET_AUTHOR,
DSS_AUTHOR_SIZE, "author"); DSS_AUTHOR_SIZE, "author");
if (ret) if (ret)
@ -164,7 +168,7 @@ static int dss_read_header(AVFormatContext *s)
/* Jump over header */ /* 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); return AVERROR(EIO);
ctx->counter = 0; ctx->counter = 0;
@ -361,7 +365,7 @@ static int dss_read_seek(AVFormatContext *s, int stream_index,
if (seekto < 0) if (seekto < 0)
seekto = 0; seekto = 0;
seekto += DSS_HEADER_SIZE; seekto += ctx->dss_header_size;
ret = avio_seek(s->pb, seekto, SEEK_SET); ret = avio_seek(s->pb, seekto, SEEK_SET);
if (ret < 0) if (ret < 0)