RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavformat/dashenc : Prevent writing manifest files multiple times

This commit is contained in:
joepadmiraal 2019-04-08 14:53:52 +02:00 committed by Karthick J
parent 4d2f62150d
commit 951561b64e
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/dashenc.c
View File

@ -145,6 +145,8 @@ typedef struct DASHContext {
int ignore_io_errors; int ignore_io_errors;
int lhls; int lhls;
int master_publish_rate; int master_publish_rate;
int nr_of_streams_to_flush;
int nr_of_streams_flushed;
} DASHContext; } DASHContext;
static struct codec_string { static struct codec_string {
@ -1089,6 +1091,7 @@ static int dash_init(AVFormatContext *s)
char *ptr; char *ptr;
char basename[1024]; char basename[1024];
c->nr_of_streams_to_flush = 0;
if (c->single_file_name) if (c->single_file_name)
c->single_file = 1; c->single_file = 1;
if (c->single_file) if (c->single_file)
@ -1302,12 +1305,18 @@ static int dash_init(AVFormatContext *s)
os->max_pts = AV_NOPTS_VALUE; os->max_pts = AV_NOPTS_VALUE;
os->last_dts = AV_NOPTS_VALUE; os->last_dts = AV_NOPTS_VALUE;
os->segment_index = 1; os->segment_index = 1;
if (s->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
c->nr_of_streams_to_flush++;
} }
if (!c->has_video && c->seg_duration <= 0) { if (!c->has_video && c->seg_duration <= 0) {
av_log(s, AV_LOG_WARNING, "no video stream and no seg duration set\n"); av_log(s, AV_LOG_WARNING, "no video stream and no seg duration set\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
c->nr_of_streams_flushed = 0;
return 0; return 0;
} }
@ -1616,8 +1625,16 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
} }
} }
} }
if (ret >= 0) if (ret >= 0) {
if (c->has_video) {
c->nr_of_streams_flushed++;
if (c->nr_of_streams_flushed != c->nr_of_streams_to_flush)
return ret;
c->nr_of_streams_flushed = 0;
}
ret = write_manifest(s, final); ret = write_manifest(s, final);
}
return ret; return ret;
} }