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

Add support for block duration.

Browse Source 
Patch by Steve Lhomme % slhomme A divxcorp P com %
Original thread:
Date: Mon, 06 Nov 2006 19:22:14 +0100
Subject: [Ffmpeg-devel] [PATCH] Matroska block duration support

Originally committed as revision 6924 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Steve L'Homme 2006-11-06 23:52:10 +00:00 committed by Aurelien Jacobs
parent 063c8f2662
commit ae17bf6ac8
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/matroska.c
View File

@ -2277,8 +2277,10 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
{ {
int res = 0; int res = 0;
uint32_t id; uint32_t id;
AVPacket *pkt; AVPacket *pkt = NULL;
int is_keyframe = PKT_FLAG_KEY, last_num_packets = matroska->num_packets; 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"); av_log(matroska->ctx, AV_LOG_DEBUG, "parsing blockgroup...\n");
@ -2300,7 +2302,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
int size; int size;
int16_t block_time; int16_t block_time;
uint32_t *lace_size = NULL; uint32_t *lace_size = NULL;
int n, track, flags, laces = 0; int n, flags, laces = 0;
uint64_t num; uint64_t num;
int64_t pos= url_ftell(&matroska->ctx->pb); int64_t pos= url_ftell(&matroska->ctx->pb);
@ -2454,11 +2456,8 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
} }
case MATROSKA_ID_BLOCKDURATION: { case MATROSKA_ID_BLOCKDURATION: {
uint64_t num; if ((res = ebml_read_uint(matroska, &id, &duration)) < 0)
if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
break; break;
av_log(matroska->ctx, AV_LOG_INFO,
"FIXME: implement support for BlockDuration\n");
break; break;
} }
@ -2487,6 +2486,14 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
} }
} }
if (pkt)
{
if (duration != AV_NOPTS_VALUE)
pkt->duration = duration;
else if (track >= 0 && track < matroska->num_tracks)
pkt->duration = matroska->tracks[track]->default_duration / matroska->time_scale;
}
return res; return res;
} }