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

matroskadec: move timecode calculation a little earlier

Browse Source 
so as to be able to use it in other part of the code

Originally committed as revision 15281 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2008-09-09 11:54:35 +00:00
parent 3fc9d7cec4
commit f14a201b32
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/matroskadec.c
View File

@ -1423,6 +1423,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
uint64_t duration, int is_keyframe, uint64_t duration, int is_keyframe,
int64_t cluster_pos) int64_t cluster_pos)
{ {
uint64_t timecode = AV_NOPTS_VALUE;
MatroskaTrack *track; MatroskaTrack *track;
int res = 0; int res = 0;
AVStream *st; AVStream *st;
@ -1458,6 +1459,13 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
if (is_keyframe == -1) if (is_keyframe == -1)
is_keyframe = flags & 0x80 ? PKT_FLAG_KEY : 0; is_keyframe = flags & 0x80 ? PKT_FLAG_KEY : 0;
if (cluster_time != (uint64_t)-1
&& (block_time >= 0 || cluster_time >= -block_time)) {
timecode = cluster_time + block_time;
if (is_keyframe)
av_add_index_entry(st, cluster_pos, timecode, 0,0,AVINDEX_KEYFRAME);
}
if (matroska->skip_to_keyframe) { if (matroska->skip_to_keyframe) {
if (!is_keyframe || st != matroska->skip_to_stream) if (!is_keyframe || st != matroska->skip_to_stream)
return res; return res;
@ -1541,16 +1549,6 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data,
} }
if (res == 0) { if (res == 0) {
uint64_t timecode = AV_NOPTS_VALUE;
if (cluster_time != (uint64_t)-1
&& (block_time >= 0 || cluster_time >= -block_time)) {
timecode = cluster_time + block_time;
if (is_keyframe)
av_add_index_entry(st, cluster_pos, timecode,
0, 0, AVINDEX_KEYFRAME);
}
for (n = 0; n < laces; n++) { for (n = 0; n < laces; n++) {
if (st->codec->codec_id == CODEC_ID_RA_288 || if (st->codec->codec_id == CODEC_ID_RA_288 ||
st->codec->codec_id == CODEC_ID_COOK || st->codec->codec_id == CODEC_ID_COOK ||