generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

matroskadec: extract common code out of ebml_read_*()

Browse Source 
Originally committed as revision 14590 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-08-05 00:41:55 +00:00
parent ba5a1f99cc
commit c6cd2b3d22
1 changed files with 28 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
libavformat/matroskadec.c
View File

@ -592,44 +592,17 @@ ebml_read_seek (MatroskaDemuxContext *matroska,
return (url_fseek(pb, offset, SEEK_SET) == offset) ? 0 : -1; return (url_fseek(pb, offset, SEEK_SET) == offset) ? 0 : -1;
} }
/*
* Skip the next element.
* 0 is success, -1 is failure.
*/
static int
ebml_read_skip (MatroskaDemuxContext *matroska)
{
ByteIOContext *pb = matroska->ctx->pb;
uint32_t id;
uint64_t length;
int res;
if ((res = ebml_read_element_id(matroska, &id)) < 0 ||
(res = ebml_read_element_length(matroska, &length)) < 0)
return res;
url_fskip(pb, length);
return 0;
}
/* /*
* Read the next element as an unsigned int. * Read the next element as an unsigned int.
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_uint (MatroskaDemuxContext *matroska, ebml_read_uint (ByteIOContext *pb,
uint32_t *id, int size,
uint64_t *num) uint64_t *num)
{ {
ByteIOContext *pb = matroska->ctx->pb; int n = 0;
int n = 0, size, res;
uint64_t rlength;
if ((res = ebml_read_element_id(matroska, id)) < 0 ||
(res = ebml_read_element_length(matroska, &rlength)) < 0)
return res;
size = rlength;
if (size < 1 || size > 8) if (size < 1 || size > 8)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -646,19 +619,10 @@ ebml_read_uint (MatroskaDemuxContext *matroska,
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_float (MatroskaDemuxContext *matroska, ebml_read_float (ByteIOContext *pb,
uint32_t *id, int size,
double *num) double *num)
{ {
ByteIOContext *pb = matroska->ctx->pb;
int size, res;
uint64_t rlength;
if ((res = ebml_read_element_id(matroska, id)) < 0 ||
(res = ebml_read_element_length(matroska, &rlength)) < 0)
return res;
size = rlength;
if (size == 4) { if (size == 4) {
*num= av_int2flt(get_be32(pb)); *num= av_int2flt(get_be32(pb));
} else if(size==8){ } else if(size==8){
@ -674,22 +638,14 @@ ebml_read_float (MatroskaDemuxContext *matroska,
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_ascii (MatroskaDemuxContext *matroska, ebml_read_ascii (ByteIOContext *pb,
uint32_t *id, int size,
char **str) char **str)
{ {
ByteIOContext *pb = matroska->ctx->pb; av_free(*str);
int size, res;
uint64_t rlength;
if ((res = ebml_read_element_id(matroska, id)) < 0 ||
(res = ebml_read_element_length(matroska, &rlength)) < 0)
return res;
size = rlength;
/* ebml strings are usually not 0-terminated, so we allocate one /* ebml strings are usually not 0-terminated, so we allocate one
* byte more, read the string and NULL-terminate it ourselves. */ * byte more, read the string and NULL-terminate it ourselves. */
if (size < 0 || !(*str = av_malloc(size + 1))) if (!(*str = av_malloc(size + 1)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (get_buffer(pb, (uint8_t *) *str, size) != size) { if (get_buffer(pb, (uint8_t *) *str, size) != size) {
av_free(*str); av_free(*str);
@ -707,16 +663,10 @@ ebml_read_ascii (MatroskaDemuxContext *matroska,
*/ */
static int static int
ebml_read_master (MatroskaDemuxContext *matroska, ebml_read_master (MatroskaDemuxContext *matroska,
uint32_t *id) int length)
{ {
ByteIOContext *pb = matroska->ctx->pb; ByteIOContext *pb = matroska->ctx->pb;
uint64_t length;
MatroskaLevel *level; MatroskaLevel *level;
int res;
if ((res = ebml_read_element_id(matroska, id)) < 0 ||
(res = ebml_read_element_length(matroska, &length)) < 0)
return res;
if (matroska->num_levels >= EBML_MAX_DEPTH) { if (matroska->num_levels >= EBML_MAX_DEPTH) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
@ -736,24 +686,16 @@ ebml_read_master (MatroskaDemuxContext *matroska,
* 0 is success, < 0 is failure. * 0 is success, < 0 is failure.
*/ */
static int static int
ebml_read_binary (MatroskaDemuxContext *matroska, ebml_read_binary (ByteIOContext *pb,
uint32_t *id, int length,
uint8_t **binary, uint8_t **binary,
int *size) int *size)
{ {
ByteIOContext *pb = matroska->ctx->pb; if (!(*binary = av_malloc(length)))
uint64_t rlength;
int res;
if ((res = ebml_read_element_id(matroska, id)) < 0 ||
(res = ebml_read_element_length(matroska, &rlength)) < 0)
return res;
*size = rlength;
if (!(*binary = av_malloc(*size)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (get_buffer(pb, *binary, *size) != *size) *size = length;
if (get_buffer(pb, *binary, length) != length)
return AVERROR(EIO); return AVERROR(EIO);
return 0; return 0;
@ -951,7 +893,9 @@ static int ebml_parse(MatroskaDemuxContext *matroska, EbmlSyntax *syntax,
static int ebml_parse_elem(MatroskaDemuxContext *matroska, static int ebml_parse_elem(MatroskaDemuxContext *matroska,
EbmlSyntax *syntax, void *data) EbmlSyntax *syntax, void *data)
{ {
ByteIOContext *pb = matroska->ctx->pb;
uint32_t id = syntax->id; uint32_t id = syntax->id;
uint64_t length;
EbmlBin *bin; EbmlBin *bin;
int res; int res;
@ -965,24 +909,28 @@ static int ebml_parse_elem(MatroskaDemuxContext *matroska,
} }
bin = data; bin = data;
if (syntax->type != EBML_PASS && syntax->type != EBML_STOP)
if ((res = ebml_read_element_id(matroska, &id)) < 0 ||
(res = ebml_read_element_length(matroska, &length)) < 0)
return res;
switch (syntax->type) { switch (syntax->type) {
case EBML_UINT: res = ebml_read_uint (matroska, &id, data); break; case EBML_UINT: res = ebml_read_uint (pb, length, data); break;
case EBML_FLOAT: res = ebml_read_float(matroska, &id, data); break; case EBML_FLOAT: res = ebml_read_float (pb, length, data); break;
case EBML_STR: case EBML_STR:
case EBML_UTF8: av_free(*(char **)data); case EBML_UTF8: res = ebml_read_ascii (pb, length, data); break;
res = ebml_read_ascii(matroska, &id, data); break;
case EBML_BIN: av_free(bin->data); case EBML_BIN: av_free(bin->data);
bin->pos = url_ftell(matroska->ctx->pb); bin->pos = url_ftell(matroska->ctx->pb);
res = ebml_read_binary(matroska, &id, &bin->data, res = ebml_read_binary(pb, length, &bin->data,
&bin->size); break; &bin->size); break;
case EBML_NEST: if ((res=ebml_read_master(matroska, &id)) < 0) case EBML_NEST: if ((res=ebml_read_master(matroska, length)) < 0)
return res; return res;
if (id == MATROSKA_ID_SEGMENT) if (id == MATROSKA_ID_SEGMENT)
matroska->segment_start = url_ftell(matroska->ctx->pb); matroska->segment_start = url_ftell(matroska->ctx->pb);
return ebml_parse(matroska, syntax->def.n, data, 0); return ebml_parse(matroska, syntax->def.n, data, 0);
case EBML_PASS: return ebml_parse(matroska, syntax->def.n, data, 1); case EBML_PASS: return ebml_parse(matroska, syntax->def.n, data, 1);
case EBML_STOP: *(int *)data = 1; return 1; case EBML_STOP: *(int *)data = 1; return 1;
default: return ebml_read_skip(matroska); default: url_fskip(pb, length); return 0;
} }
if (res == AVERROR_INVALIDDATA) if (res == AVERROR_INVALIDDATA)
av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n"); av_log(matroska->ctx, AV_LOG_ERROR, "Invalid element\n");