diff options
author | Limin Wang <lance.lmwang@gmail.com> | 2020-03-29 19:13:44 +0800 |
---|---|---|
committer | Steven Liu <lq@chinaffmpeg.org> | 2020-04-08 23:02:41 +0800 |
commit | cd8c5e89ba4bb9160a1a42c1d612a3f2b9085a6a (patch) | |
tree | c3cb36e99806be92a57637793d33b627f2e42d66 /libavformat/hlsenc.c | |
parent | 73dc87c4f07f82b9756b3bbf4d4e9f18e46ef2e3 (diff) |
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/hlsenc.c')
-rw-r--r-- | libavformat/hlsenc.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index ae5eae4a7d..fda9431edc 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -164,6 +164,7 @@ typedef struct VariantStream { int is_default; /* default status of audio group */ char *language; /* audio lauguage name */ char *agroup; /* audio group name */ + char *sgroup; /* subtitle group name */ char *ccgroup; /* closed caption group name */ char *baseurl; char *varname; // variant name @@ -1285,7 +1286,9 @@ static int create_master_playlist(AVFormatContext *s, unsigned int i, j; int ret, bandwidth; const char *m3u8_rel_name = NULL; + const char *vtt_m3u8_rel_name = NULL; char *ccgroup; + char *sgroup = NULL; ClosedCaptionsStream *ccs; const char *proto = avio_find_protocol_name(hls->master_m3u8_url); int is_file_proto = proto && !strcmp(proto, "file"); @@ -1408,13 +1411,24 @@ static int create_master_playlist(AVFormatContext *s, vs->ccgroup); } + if (vid_st && vs->sgroup) { + sgroup = vs->sgroup; + vtt_m3u8_rel_name = get_relative_url(hls->master_m3u8_url, vs->vtt_m3u8_name); + if (!vtt_m3u8_rel_name) { + av_log(s, AV_LOG_WARNING, "Unable to find relative subtitle URL\n"); + break; + } + + ff_hls_write_subtitle_rendition(hls->m3u8_out, sgroup, vtt_m3u8_rel_name, vs->language, i, hls->has_default_key ? vs->is_default : 1); + } + if (!hls->has_default_key || !hls->has_video_m3u8) { ff_hls_write_stream_info(vid_st, hls->m3u8_out, bandwidth, m3u8_rel_name, - aud_st ? vs->agroup : NULL, vs->codec_attr, ccgroup); + aud_st ? vs->agroup : NULL, vs->codec_attr, ccgroup, sgroup); } else { if (vid_st) { ff_hls_write_stream_info(vid_st, hls->m3u8_out, bandwidth, m3u8_rel_name, - aud_st ? vs->agroup : NULL, vs->codec_attr, ccgroup); + aud_st ? vs->agroup : NULL, vs->codec_attr, ccgroup, sgroup); } } } @@ -1889,6 +1903,7 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) * practical usage) * * agroup: is key to specify audio group. A string can be given as value. + * sgroup: is key to specify subtitle group. A string can be given as value. */ p = av_strdup(hls->var_stream_map); if (!p) @@ -1956,6 +1971,12 @@ static int parse_variant_stream_mapstring(AVFormatContext *s) if (!vs->agroup) return AVERROR(ENOMEM); continue; + } else if (av_strstart(keyval, "sgroup:", &val)) { + av_free(vs->sgroup); + vs->sgroup = av_strdup(val); + if (!vs->sgroup) + return AVERROR(ENOMEM); + continue; } else if (av_strstart(keyval, "ccgroup:", &val)) { av_free(vs->ccgroup); vs->ccgroup = av_strdup(val); @@ -2512,6 +2533,7 @@ static void hls_free_variant_streams(struct HLSContext *hls) av_freep(&vs->m3u8_name); av_freep(&vs->streams); av_freep(&vs->agroup); + av_freep(&vs->sgroup); av_freep(&vs->language); av_freep(&vs->ccgroup); av_freep(&vs->baseurl); |