virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

matroskadec: store the ID of the currently parsed ebml element

Browse Source 
This allows to interrupt parsing after reading an ID, and then properly
recover parsing.

Originally committed as revision 23587 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2010-06-11 16:34:01 +00:00
parent 6c58adf3b7
commit c3ade62ca3
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/matroskadec.c
View File

@ -214,6 +214,7 @@ typedef struct {
int num_levels; int num_levels;
MatroskaLevel levels[EBML_MAX_DEPTH]; MatroskaLevel levels[EBML_MAX_DEPTH];
int level_up; int level_up;
uint32_t current_id;
uint64_t time_scale; uint64_t time_scale;
double duration; double duration;
@ -724,12 +725,14 @@ static int ebml_parse_id(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
void *data) void *data)
{ {
if (!matroska->current_id) {
uint64_t id; uint64_t id;
int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id); int res = ebml_read_num(matroska, matroska->ctx->pb, 4, &id);
if (res < 0) if (res < 0)
return res; return res;
id |= 1 << 7*res; matroska->current_id = id | 1 << 7*res;
return ebml_parse_id(matroska, syntax, id, data); }
return ebml_parse_id(matroska, syntax, matroska->current_id, data);
} }
static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
@ -774,9 +777,11 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
list->nb_elem++; list->nb_elem++;
} }
if (syntax->type != EBML_PASS && syntax->type != EBML_STOP) if (syntax->type != EBML_PASS && syntax->type != EBML_STOP) {
matroska->current_id = 0;
if ((res = ebml_read_num(matroska, pb, 8, &length)) < 0) if ((res = ebml_read_num(matroska, pb, 8, &length)) < 0)
return res; return res;
}
switch (syntax->type) { switch (syntax->type) {
case EBML_UINT: res = ebml_read_uint (pb, length, data); break; case EBML_UINT: res = ebml_read_uint (pb, length, data); break;
@ -1063,6 +1068,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
MatroskaSeekhead *seekhead = seekhead_list->elem; MatroskaSeekhead *seekhead = seekhead_list->elem;
uint32_t level_up = matroska->level_up; uint32_t level_up = matroska->level_up;
int64_t before_pos = url_ftell(matroska->ctx->pb); int64_t before_pos = url_ftell(matroska->ctx->pb);
uint32_t saved_id = matroska->current_id;
MatroskaLevel level; MatroskaLevel level;
int i; int i;
@ -1096,6 +1102,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
level.length = (uint64_t)-1; level.length = (uint64_t)-1;
matroska->levels[matroska->num_levels] = level; matroska->levels[matroska->num_levels] = level;
matroska->num_levels++; matroska->num_levels++;
matroska->current_id = 0;
ebml_parse(matroska, matroska_segment, matroska); ebml_parse(matroska, matroska_segment, matroska);
@ -1110,6 +1117,7 @@ static void matroska_execute_seekhead(MatroskaDemuxContext *matroska)
/* seek back */ /* seek back */
url_fseek(matroska->ctx->pb, before_pos, SEEK_SET); url_fseek(matroska->ctx->pb, before_pos, SEEK_SET);
matroska->level_up = level_up; matroska->level_up = level_up;
matroska->current_id = saved_id;
} }
static int matroska_aac_profile(char *codec_id) static int matroska_aac_profile(char *codec_id)