Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scale duration and default_duration

Browse Source 
Originally committed as revision 8363 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Aurelien Jacobs 18 years ago
parent 20bd4e0799
commit 25f2b76fdb
1 changed files with 7 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      libavformat/matroska.c

13
libavformat/matroska.c
Unescape View File

@ -254,7 +254,7 @@ typedef struct Track {
unsigned char *codec_priv; unsigned char *codec_priv;
int codec_priv_size; int codec_priv_size;
int64_t default_duration; uint64_t default_duration;
MatroskaTrackFlags flags; MatroskaTrackFlags flags;
} MatroskaTrack; } MatroskaTrack;
@ -1307,7 +1307,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if ((res = ebml_read_uint (matroska, &id, if ((res = ebml_read_uint (matroska, &id,
&num)) < 0) &num)) < 0)
break; break;
track->default_duration = num; track->default_duration = num/matroska->time_scale;
break; break;
} }
@ -1317,7 +1317,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
if ((res = ebml_read_float(matroska, &id, if ((res = ebml_read_float(matroska, &id,
&num)) < 0) &num)) < 0)
break; break;
track->default_duration = 1000000000 * (1. / num); track->default_duration = 1000000000/(matroska->time_scale*num);
break; break;
} }
@ -1620,7 +1620,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
uint64_t num; uint64_t num;
if ((res = ebml_read_uint(matroska, &id, &num)) < 0) if ((res = ebml_read_uint(matroska, &id, &num)) < 0)
break; break;
track->default_duration = num; track->default_duration = num / matroska->time_scale;
break; break;
} }
@ -2357,7 +2357,7 @@ matroska_read_header (AVFormatContext *s,
if (track->default_duration) if (track->default_duration)
av_reduce(&st->codec->time_base.num, &st->codec->time_base.den, av_reduce(&st->codec->time_base.num, &st->codec->time_base.den,
track->default_duration, 1000000000, 30000); track->default_duration, 1000, 30000);
if(extradata){ if(extradata){
st->codec->extradata = extradata; st->codec->extradata = extradata;
@ -2646,6 +2646,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
case MATROSKA_ID_BLOCKDURATION: { case MATROSKA_ID_BLOCKDURATION: {
if ((res = ebml_read_uint(matroska, &id, &duration)) < 0) if ((res = ebml_read_uint(matroska, &id, &duration)) < 0)
break; break;
duration /= matroska->time_scale;
break; break;
} }
@ -2691,7 +2692,7 @@ matroska_parse_blockgroup (MatroskaDemuxContext *matroska,
if (duration != AV_NOPTS_VALUE) if (duration != AV_NOPTS_VALUE)
pkt->duration = duration; pkt->duration = duration;
else if (track >= 0 && track < matroska->num_tracks) else if (track >= 0 && track < matroska->num_tracks)
pkt->duration = matroska->tracks[track]->default_duration / matroska->time_scale; pkt->duration = matroska->tracks[track]->default_duration;
} }
return res; return res;

Write Preview
Loading…
Cancel
Save