virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Fix double write of DASH manifest in streaming mode

Browse Source 
When streaming mode is enabled, the DASH manifest is written on the
first packet for the segment so that the segment can be advertised
immediately to clients. It was also still writing the manifest at the
end of the segment leading to two duplicate writes.
This commit is contained in:
Kevin LaFlamme 2021-06-24 08:58:07 -04:00 committed by Karthick J
parent ca56299fb3
commit 3f5d5c1c2d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/dashenc.c
View File

@ -2030,7 +2030,10 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
c->nr_of_streams_flushed = 0; c->nr_of_streams_flushed = 0;
} }
ret = write_manifest(s, final); // In streaming mode the manifest is written at the beginning
// of the segment instead
if (!c->streaming || final)
ret = write_manifest(s, final);
} }
return ret; return ret;
} }
@ -2261,7 +2264,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt)
// in streaming mode, the segments are available for playing // in streaming mode, the segments are available for playing
// before fully written but the manifest is needed so that // before fully written but the manifest is needed so that
// clients and discover the segment filenames. // clients and discover the segment filenames.
if (c->streaming && os->segment_type == SEGMENT_TYPE_MP4) { if (c->streaming) {
write_manifest(s, 0); write_manifest(s, 0);
} }