har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

split a matroska_parse_block() function from matroska_parse_blockgroup()

Browse Source 
Originally committed as revision 8178 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2007-03-01 23:46:14 +00:00
parent ebfcf31ddf
commit 1afdcdf1fc
1 changed files with 44 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
libavformat/matroska.c
View File

@ -2376,32 +2376,13 @@ rv_offset(uint8_t *data, int slice, int slices)
} }
static int static int
matroska_parse_blockgroup (MatroskaDemuxContext *matroska, matroska_parse_block(MatroskaDemuxContext *matroska, uint64_t cluster_time,
uint64_t cluster_time) int is_keyframe, int *ptrack, AVPacket **ppkt)
{ {
int res = 0; int res;
uint32_t id; uint32_t id;
AVPacket *pkt = NULL; int track;
int is_keyframe = PKT_FLAG_KEY, last_num_packets = matroska->num_packets; AVPacket *pkt;
uint64_t duration = AV_NOPTS_VALUE;
int track = -1;
av_log(matroska->ctx, AV_LOG_DEBUG, "parsing blockgroup...\n");
while (res == 0) {
if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
res = AVERROR_IO;
break;
} else if (matroska->level_up) {
matroska->level_up--;
break;
}
switch (id) {
/* one block inside the group. Note, block parsing is one
* of the harder things, so this code is a bit complicated.
* See http://www.matroska.org/ for documentation. */
case MATROSKA_ID_BLOCK: {
uint8_t *data, *origdata; uint8_t *data, *origdata;
int size; int size;
int16_t block_time; int16_t block_time;
@ -2411,7 +2392,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
int64_t pos= url_ftell(&matroska->ctx->pb); int64_t pos= url_ftell(&matroska->ctx->pb);
if ((res = ebml_read_binary(matroska, &id, &data, &size)) < 0) if ((res = ebml_read_binary(matroska, &id, &data, &size)) < 0)
break; return res;
origdata = data; origdata = data;
/* first byte(s): tracknum */ /* first byte(s): tracknum */
@ -2419,22 +2400,23 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"EBML block data error\n"); "EBML block data error\n");
av_free(origdata); av_free(origdata);
break; return res;
} }
data += n; data += n;
size -= n; size -= n;
/* fetch track from num */ /* fetch track from num */
track = matroska_find_track_by_num(matroska, num); track = matroska_find_track_by_num(matroska, num);
if (ptrack) *ptrack = track;
if (size <= 3 || track < 0 || track >= matroska->num_tracks) { if (size <= 3 || track < 0 || track >= matroska->num_tracks) {
av_log(matroska->ctx, AV_LOG_INFO, av_log(matroska->ctx, AV_LOG_INFO,
"Invalid stream %d or size %u\n", track, size); "Invalid stream %d or size %u\n", track, size);
av_free(origdata); av_free(origdata);
break; return res;
} }
if(matroska->ctx->streams[ matroska->tracks[track]->stream_index ]->discard >= AVDISCARD_ALL){ if(matroska->ctx->streams[ matroska->tracks[track]->stream_index ]->discard >= AVDISCARD_ALL){
av_free(origdata); av_free(origdata);
break; return res;
} }
/* block_time (relative to cluster time) */ /* block_time (relative to cluster time) */
@ -2549,6 +2531,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
else else
slice_size = rv_offset(data, slice+1, slices) - slice_offset; slice_size = rv_offset(data, slice+1, slices) - slice_offset;
pkt = av_mallocz(sizeof(AVPacket)); pkt = av_mallocz(sizeof(AVPacket));
if (ppkt) *ppkt = pkt;
/* XXX: prevent data copy... */ /* XXX: prevent data copy... */
if (av_new_packet(pkt, slice_size) < 0) { if (av_new_packet(pkt, slice_size) < 0) {
res = AVERROR_NOMEM; res = AVERROR_NOMEM;
@ -2573,6 +2556,38 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
av_free(lace_size); av_free(lace_size);
av_free(origdata); av_free(origdata);
return res;
}
static int
matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
uint64_t cluster_time)
{
int res = 0;
uint32_t id;
AVPacket *pkt = NULL;
int is_keyframe = PKT_FLAG_KEY, last_num_packets = matroska->num_packets;
uint64_t duration = AV_NOPTS_VALUE;
int track = -1;
av_log(matroska->ctx, AV_LOG_DEBUG, "parsing blockgroup...\n");
while (res == 0) {
if (!(id = ebml_peek_id(matroska, &matroska->level_up))) {
res = AVERROR_IO;
break;
} else if (matroska->level_up) {
matroska->level_up--;
break;
}
switch (id) {
/* one block inside the group. Note, block parsing is one
* of the harder things, so this code is a bit complicated.
* See http://www.matroska.org/ for documentation. */
case MATROSKA_ID_BLOCK: {
res = matroska_parse_block(matroska, cluster_time,
is_keyframe, &track, &pkt);
break; break;
} }