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: simplify check for hierarchy level

Browse Source 
Originally committed as revision 14594 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:42:08 +00:00
parent f7b9687cbb
commit 592110c26c
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libavformat/matroskadec.c
View File

@ -456,29 +456,21 @@ static EbmlSyntax matroska_clusters[] = {
}; };
/* /*
* Return: the amount of levels in the hierarchy that the * Return: whether we reached the end of a level in the hierarchy or not
* current element lies higher than the previous one.
* The opposite isn't done - that's auto-done using master
* element reading.
*/ */
static int ebml_read_element_level_up(MatroskaDemuxContext *matroska) static int ebml_level_end(MatroskaDemuxContext *matroska)
{ {
ByteIOContext *pb = matroska->ctx->pb; ByteIOContext *pb = matroska->ctx->pb;
offset_t pos = url_ftell(pb); offset_t pos = url_ftell(pb);
int num = 0;
while (matroska->num_levels > 0) { if (matroska->num_levels > 0) {
MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1]; MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1];
if (pos - level->start >= level->length) {
if (pos >= level->start + level->length) {
matroska->num_levels--; matroska->num_levels--;
num++; return 1;
} else {
break;
} }
} }
return 0;
return num;
} }
/* /*
@ -933,17 +925,10 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
break; break;
} }
while (!res) { while (!res && !ebml_level_end(matroska)) {
res2 = ebml_read_element_id(matroska, &id); res2 = ebml_read_element_id(matroska, &id);
if (res2 < 0) if (res2 < 0)
break; break;
if (res2 > 0)
matroska->level_up = ebml_read_element_level_up(matroska);
if (matroska->level_up) {
matroska->level_up--;
break;
}
res = ebml_parse_id(matroska, syntax, id, data); res = ebml_parse_id(matroska, syntax, id, data);
if (once) if (once)
break; break;