aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/dashenc.c
diff options
context:
space:
mode:
authorLimin Wang <lance.lmwang@gmail.com>2020-03-29 19:13:44 +0800
committerSteven Liu <lq@chinaffmpeg.org>2020-04-08 23:02:41 +0800
commitcd8c5e89ba4bb9160a1a42c1d612a3f2b9085a6a (patch)
treec3cb36e99806be92a57637793d33b627f2e42d66 /libavformat/dashenc.c
parent73dc87c4f07f82b9756b3bbf4d4e9f18e46ef2e3 (diff)
downloadffmpeg-cd8c5e89ba4bb9160a1a42c1d612a3f2b9085a6a.tar.gz
avformat: add subtitle support in master playlist m3u8
Test with the following command for the webvtt subtitle: $ ./ffmpeg -y -i input_with_subtitle.mkv \ -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ -b:a:0 256k \ -c:s webvtt -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0 -map 0:s:0 \ -f hls -var_stream_map "v:0,a:0,s:0,sgroup:subtitle" \ -master_pl_name master.m3u8 -t 300 -hls_time 10 -hls_init_time 4 -hls_list_size \ 10 -master_pl_publish_rate 10 -hls_flags \ delete_segments+discont_start+split_by_time ./tmp/video.m3u8 Check the master m3u8: $ cat tmp/master.m3u8 #EXTM3U #EXT-X-VERSION:3 #EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subtitle",NAME="subtitle_0",DEFAULT=YES,URI="video_vtt.m3u8" #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33",SUBTITLES="subtitle" video.m3u8 Check the result by convert to mkv: $ ./ffmpeg -strict experimental -i ./tmp/master.m3u8 -c:v copy -c:a mp2 -c:s srt ./test.mkv Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Diffstat (limited to 'libavformat/dashenc.c')
-rw-r--r--libavformat/dashenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 94d463972a..d1fe90b00c 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -1311,7 +1311,7 @@ static int write_manifest(AVFormatContext *s, int final)
get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i);
ff_hls_write_stream_info(st, c->m3u8_out, stream_bitrate,
playlist_file, agroup,
- codec_str_ptr, NULL);
+ codec_str_ptr, NULL, NULL);
}
dashenc_io_close(s, &c->m3u8_out, temp_filename);
if (use_rename)