ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 13:26:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

lavf/dashenc: Fix segment duration overflow on fine time bases.

Browse Source 
When stream time bases are very fine grained (e.g. nanoseconds), 32-bit
segment duration may overflow for even for rather small segment duration
(about 4 seconds long). Therefore we use 64-bit values for segment duration.
This commit is contained in:
Andrey Semashev 2018-11-20 20:33:52 +03:00 committed by Karthick J
parent e895b800fe
commit fa08345e88
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/dashenc.c
View File

@ -60,7 +60,7 @@ typedef struct Segment {
int64_t start_pos; int64_t start_pos;
int range_length, index_length; int range_length, index_length;
int64_t time; int64_t time;
int duration; int64_t duration;
int n; int n;
} Segment; } Segment;
@ -475,7 +475,7 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatCont
cur_time = seg->time; cur_time = seg->time;
avio_printf(out, "t=\"%"PRId64"\" ", seg->time); avio_printf(out, "t=\"%"PRId64"\" ", seg->time);
} }
avio_printf(out, "d=\"%d\" ", seg->duration); avio_printf(out, "d=\"%"PRId64"\" ", seg->duration);
while (i + repeat + 1 < os->nb_segments && while (i + repeat + 1 < os->nb_segments &&
os->segments[i + repeat + 1]->duration == seg->duration && os->segments[i + repeat + 1]->duration == seg->duration &&
os->segments[i + repeat + 1]->time == os->segments[i + repeat]->time + os->segments[i + repeat]->duration) os->segments[i + repeat + 1]->time == os->segments[i + repeat]->time + os->segments[i + repeat]->duration)
@ -1213,7 +1213,7 @@ static int dash_write_header(AVFormatContext *s)
} }
static int add_segment(OutputStream *os, const char *file, static int add_segment(OutputStream *os, const char *file,
int64_t time, int duration, int64_t time, int64_t duration,
int64_t start_pos, int64_t range_length, int64_t start_pos, int64_t range_length,
int64_t index_length, int next_exp_index) int64_t index_length, int next_exp_index)
{ {