videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

matroskadec: use generic parser to parse info 

Originally committed as revision 14561 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:40:27 +00:00
parent b414cb892e
commit 29708581fc
1 changed files with 22 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
libavformat/matroskadec.c
View File

@ -195,7 +195,9 @@ typedef struct MatroskaDemuxContext {
int level_up; int level_up;
/* timescale in the file */ /* timescale in the file */
int64_t time_scale; uint64_t time_scale;
double duration;
char *title;
EbmlList attachments; EbmlList attachments;
EbmlList chapters; EbmlList chapters;
EbmlList index; EbmlList index;
@ -245,6 +247,18 @@ static EbmlSyntax ebml_syntax[] = {
{ 0 } { 0 }
}; };
static EbmlSyntax matroska_info[] = {
{ MATROSKA_ID_TIMECODESCALE, EBML_UINT, 0, offsetof(MatroskaDemuxContext,time_scale), {.u=1000000} },
{ MATROSKA_ID_DURATION, EBML_FLOAT, 0, offsetof(MatroskaDemuxContext,duration) },
{ MATROSKA_ID_TITLE, EBML_UTF8, 0, offsetof(MatroskaDemuxContext,title) },
{ MATROSKA_ID_WRITINGAPP, EBML_NONE },
{ MATROSKA_ID_MUXINGAPP, EBML_NONE },
{ MATROSKA_ID_DATEUTC, EBML_NONE },
{ MATROSKA_ID_SEGMENTUID, EBML_NONE },
{ EBML_ID_VOID, EBML_NONE },
{ 0 }
};
static EbmlSyntax matroska_attachment[] = { static EbmlSyntax matroska_attachment[] = {
{ MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) }, { MATROSKA_ID_FILENAME, EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) },
{ MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement,mime) }, { MATROSKA_ID_FILEMIMETYPE, EBML_STR, 0, offsetof(MatroskaAttachement,mime) },
@ -1062,67 +1076,14 @@ static void ebml_free(EbmlSyntax *syntax, void *data)
static int static int
matroska_parse_info (MatroskaDemuxContext *matroska) matroska_parse_info (MatroskaDemuxContext *matroska)
{ {
int res = 0; int res = ebml_parse(matroska, matroska_info, matroska, MATROSKA_ID_INFO, 0);
uint32_t id;
av_log(matroska->ctx, AV_LOG_DEBUG, "Parsing info...\n"); if (matroska->duration)
matroska->ctx->duration = matroska->duration * matroska->time_scale
while (res == 0) { * 1000 / AV_TIME_BASE;
if (!(id = ebml_peek_id(matroska, &matroska->level_up))) { if (matroska->title)
res = AVERROR(EIO); strncpy(matroska->ctx->title, matroska->title,
break; sizeof(matroska->ctx->title)-1);
} else if (matroska->level_up) {
matroska->level_up--;
break;
}
switch (id) {
/* cluster timecode */
case MATROSKA_ID_TIMECODESCALE: {
uint64_t num;
if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
break;
matroska->time_scale = num;
break;
}
case MATROSKA_ID_DURATION: {
double num;
if ((res = ebml_read_float(matroska, &id, &num)) < 0)
break;
matroska->ctx->duration = num * matroska->time_scale * 1000 / AV_TIME_BASE;
break;
}
case MATROSKA_ID_TITLE: {
char *text;
if ((res = ebml_read_utf8(matroska, &id, &text)) < 0)
break;
strncpy(matroska->ctx->title, text,
sizeof(matroska->ctx->title)-1);
av_free(text);
break;
}
default:
av_log(matroska->ctx, AV_LOG_INFO,
"Unknown entry 0x%x in info header\n", id);
/* fall-through */
case MATROSKA_ID_WRITINGAPP:
case MATROSKA_ID_MUXINGAPP:
case MATROSKA_ID_DATEUTC:
case MATROSKA_ID_SEGMENTUID:
case EBML_ID_VOID:
res = ebml_read_skip(matroska);
break;
}
if (matroska->level_up) {
matroska->level_up--;
break;
}
}
return res; return res;
} }
@ -2154,8 +2115,6 @@ matroska_read_header (AVFormatContext *s,
switch (id) { switch (id) {
/* stream info */ /* stream info */
case MATROSKA_ID_INFO: { case MATROSKA_ID_INFO: {
if ((res = ebml_read_master(matroska, &id)) < 0)
break;
res = matroska_parse_info(matroska); res = matroska_parse_info(matroska);
break; break;
} }