From patchwork Thu Mar 26 13:56:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18412 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E736D449BED for ; Thu, 26 Mar 2020 15:57:13 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C433068B5D6; Thu, 26 Mar 2020 15:57:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2672968A957 for ; Thu, 26 Mar 2020 15:57:07 +0200 (EET) Received: by mail-pg1-f196.google.com with SMTP id d37so2400653pgl.1 for ; Thu, 26 Mar 2020 06:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=L+7Lhvee+ugSYMiklBVCysevzhOuBa7Lrv0/nRhl0BQ=; b=b53YEQlBkZhTq47pVLuj/MLXTvoU1LZETOeCK9YL04EarDiGcZBg+4WuH+NpXJhwSt zKj7f9bwioI0ohxIRNFeqPUOyfo3EL6NdpPhBiS2OyJhKWtfONAoi4VDkZOOyOU1rot2 cKTCKCPnjs52akU8UvGCKNq+vfUUfFUckOIKXoO+L+EGmrXWJkMXz33tjv60iACU84P9 f96t1B096/r9zScK02F9DHZDSXL41goR4zJkUfpIAcWCr+9q16FZNMD18F1uJvINzCMx oGLx8LSHAmo21kbwX5CBj253npzfmB0q6RkVM77OyE39f1zZ0H5Qv98DZflz3ieZQePG YzpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=L+7Lhvee+ugSYMiklBVCysevzhOuBa7Lrv0/nRhl0BQ=; b=UZ2beoR8fu5A/RnlzvOIBEaDpf/TpDqRN3lfn/IeRZalDYnIoP98ELhz38k9TavuOn J6AqFSmJfAj2wBJHSOpS6WIfp0+vddzakfM5gkd0nm7KxijUMpWt2PgkPGMomiZN+aqx J7YD6UnSdKPUd5/3g8bIVsw5Qyc3NbYHeW/bVgFkhsgay6NHa+9qejRDaFbpmtLhHCKu JlRELXttTUEEUnMlO3H0P04B53I3cuVuIFnW3bD/btbWfGo9NAqP1AHzLGgF6sYGlIsG eiBCLlPYMf1zMbsIuNuxDzYrDKCBu9u45uXJiWZdWsY3w9e5iO8bIrq4jJlhJE1aWxpW aPow== X-Gm-Message-State: ANhLgQ2HTaqytSAGhKeyW3bsJ8w2JAziEwuPkgiExAnAM4JeAM09g7ns 0r2wI3g0kYAm59mnCd62pXFn9Gp7 X-Google-Smtp-Source: ADFU+vu/ONq9UjHkwKJL1AzYlQv/qgvIlkzFI8EpsIUp8P/7P+ZxvZfzKXmSo9IJ12ELkTh9H52l3A== X-Received: by 2002:a63:180c:: with SMTP id y12mr2737580pgl.421.1585231024901; Thu, 26 Mar 2020 06:57:04 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b16sm1762439pfb.71.2020.03.26.06.57.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:57:04 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 21:56:57 +0800 Message-Id: <20200326135700.11167-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/4] avformat/hlsenc: remove the first slash of the relative path line in the master m3u8 file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Please testing with the following command: ./ffmpeg -y -i input.mkv \ -b:v:0 5250k -c:v h264 -pix_fmt yuv420p -profile:v main -level 4.1 \ -b:a:0 256k \ -c:a mp2 -ar 48000 -ac 2 -map 0:v -map 0:a:0\ -f hls -var_stream_map "v:0,a:0" \ -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 then cat ./tmp/master.m3u8 before: #EXTM3U #EXT-X-VERSION:3 #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" /video.m3u8 $ ./ffmpeg -i ./tmp/master.m3u8 -c:v copy -c:a mp2 ./test.mkv [hls @ 0x7f82f9000000] Skip ('#EXT-X-VERSION:3') [hls @ 0x7f82f9000000] Opening '/video.m3u8' for reading [hls @ 0x7f82f9000000] parse_playlist error No such file or directory [/video.m3u8] ./tmp/master.m3u8: No such file or directory after: #EXTM3U #EXT-X-VERSION:3 #EXT-X-STREAM-INF:BANDWIDTH=6056600,RESOLUTION=1280x720,CODECS="avc1.4d4829,mp4a.40.33" video.m3u8 Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index b4c72b6e54..a0a3a4647b 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -1260,7 +1260,7 @@ static const char* get_relative_url(const char *master_url, const char *media_ur } } - return media_url + base_len; + return media_url + base_len + 1; } static int64_t get_stream_bit_rate(AVStream *stream) From patchwork Thu Mar 26 13:56:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18413 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 39A71449BED for ; Thu, 26 Mar 2020 15:57:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22E2868B5F8; Thu, 26 Mar 2020 15:57:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 033FD68A957 for ; Thu, 26 Mar 2020 15:57:08 +0200 (EET) Received: by mail-pg1-f195.google.com with SMTP id j29so2910504pgl.3 for ; Thu, 26 Mar 2020 06:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1J6Z71iURuYvsd5yh03/7GYZIxGpsQBm3V0FuelMEWs=; b=PKNXKow0n13FIDWxObOLSMnak9BSvqbXfrf8/dFd1zE84xzc83E0EFQaHdKvBy+Jz2 +BiUEcS4BUVb2qQ645+qwUukKdYUSQXDuTGiLTNyVGrbhTVjdcd5Hz+hgA24VNCWta1o VI8KG1b/++G9ixzHEKRE/FL6oOx2MxSzul6I2er5348FNEe+IHxS8JFzcecdTtdkSWwZ 3OUPraGnEoNQTM1TuAGAJ7SCsXLC3kz9NuxEcSuyOsugWlnt2ExyL5z8seYF2O5L2Jsc QCui9cDSWnJc5vsjlc4aUr/26yVKXTYuCDXEE6FOAwEpDiZIoyGEmUdqS43i5WN9BW// 5H4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1J6Z71iURuYvsd5yh03/7GYZIxGpsQBm3V0FuelMEWs=; b=dkugD9FCY1PWznk7f0pXk9eLX19BZuVlGBkwlhA47F1Nqn/jXRVTCEb/YPdvPLP0sH swUz6aBBEcBOPnlBYa7VXJzcZGZjgpnzkVb2z+CFzaZSIzoMexYffSyvwso50AuYgekD 6w5Nyvis1qOXwdKZ1h9VnOiy3HreT00JLsxJWfwRPeOMGNRp02Ex6aJL5bnzWR3aeSxp DvslCSKEYPr4h8avcDZhV9YbwXALBYEAr5w4++tbN80Ob/guHfdHJ3CEsrWmI8j4v86a pYSFFiTz2CQVPwXLjAlu7iaD8Ww4n7QTicgtGWcYS4HLmhwHzHo0Xbk9hp/8NrZTmqz7 CgnQ== X-Gm-Message-State: ANhLgQ2z5Yrm71MAw7mhBOT/cFydyMWTXqCQ4AIIWyVuEaDDfURoj9ae XNFt1o/CSZXzx7PBVktXpqDBV8I1 X-Google-Smtp-Source: ADFU+vvZNEBSSK+MUE7E/adnqYPEcLsqT9L74SfmjbZLFoCP2otaHd01QK+Av8OEouS9VapLzyWmOQ== X-Received: by 2002:a63:24c6:: with SMTP id k189mr8542955pgk.436.1585231026256; Thu, 26 Mar 2020 06:57:06 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b16sm1762439pfb.71.2020.03.26.06.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:57:05 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 21:56:58 +0800 Message-Id: <20200326135700.11167-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200326135700.11167-1-lance.lmwang@gmail.com> References: <20200326135700.11167-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/4] avformat/hlsplaylist: simplify code for checking whether the string is empty X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/hlsplaylist.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index 9cbd02353f..56244496c0 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -65,11 +65,11 @@ void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, if (st && st->codecpar->width > 0 && st->codecpar->height > 0) avio_printf(out, ",RESOLUTION=%dx%d", st->codecpar->width, st->codecpar->height); - if (codecs && strlen(codecs) > 0) + if (codecs && codecs[0]) avio_printf(out, ",CODECS=\"%s\"", codecs); - if (agroup && strlen(agroup) > 0) + if (agroup && agroup[0]) avio_printf(out, ",AUDIO=\"group_%s\"", agroup); - if (ccgroup && strlen(ccgroup) > 0) + if (ccgroup && ccgroup[0]) avio_printf(out, ",CLOSED-CAPTIONS=\"%s\"", ccgroup); avio_printf(out, "\n%s\n\n", filename); } From patchwork Thu Mar 26 13:56:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18414 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 4BA0B449BED for ; Thu, 26 Mar 2020 15:57:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37B7C68B657; Thu, 26 Mar 2020 15:57:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6CBC68B5F5 for ; Thu, 26 Mar 2020 15:57:09 +0200 (EET) Received: by mail-pg1-f182.google.com with SMTP id k191so2889143pgc.13 for ; Thu, 26 Mar 2020 06:57:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IoPNmXRmWgeAq8C/8dXfrU7AsFdqDsDr52ClJ0ZSSV8=; b=WJQEF/bQ7xQ1MMr0iXTie15bN/cEqrgeaciRRCeYQRul+o2XTLcOxZbDoNjHx0nBtN XNY9P4SgF2MsyHbiBoI8N7PlsyhkinV0YfZfhYKBbu9ZZF2sKXYAKmqbIygHjhvgXsue jlI6chiL65xUyeAmQVaUum4bsTW4CUG9Jn+aU8Bymi5W3LS4qcIVpue9K0NCBpBtuJ6T GdnXsSSXh4/O1/3kmu362x02sIHR86dRJ6994Pn4K/68XAs92OM5HpfvEmiKhjVyPJp2 534qhafdMbMLSu1Cy8PIPWxFyeYWLhfHsM8apoJXkjelYa/dTBDfPlOU8K6aqaY3kY8L Ckag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IoPNmXRmWgeAq8C/8dXfrU7AsFdqDsDr52ClJ0ZSSV8=; b=NOSv7kEk1uuwuoKQr40dNcPo1TxL/fqvqqITZyEk5ZsoDiIy/bs8vbntROA5hrwlVD FL+ZXU27GsPJQh8HmlbwS4RN6QwC/mFsgzHHZwoiR4wXEOwB72O9UJd+BSY+zudwZDGB zniU1EK5jconx8KeDjvdVFANCM1c1zt3ejPda4Lx/s3aTsZwDWFX7hZ5vc4Mt5PkhoAQ P88gC0zws2YQosJ0olo9wZyLnTIKHBQzeBNNiuCjgbZxfLBuBGCT2pIKpyyEQjJ6w74q NQaFErPKp4diqlY7EkIAEf908lRxH9qa+XvcGc1VvvzMbMuNNfItXfcPeIDLb4IA0xR3 y8nQ== X-Gm-Message-State: ANhLgQ1Ybj1Y8HohUvlVhdMyp7VUnq0/HERbD8PfAEFoFk5MIne9yduT S9igsd6rPKDY3ka4liCkDXhE3+WF X-Google-Smtp-Source: ADFU+vtjNVnWodzd1sr5l0TgHDhdCrT1P9msLX4aqAxSiLNVqnzR2N+AKogf3Pg39GkXk8vurP4WGQ== X-Received: by 2002:a62:3086:: with SMTP id w128mr9102783pfw.63.1585231027709; Thu, 26 Mar 2020 06:57:07 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b16sm1762439pfb.71.2020.03.26.06.57.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:57:07 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 21:56:59 +0800 Message-Id: <20200326135700.11167-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200326135700.11167-1-lance.lmwang@gmail.com> References: <20200326135700.11167-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 3/4] avformat: add subtitle support in master playlist m3u8 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang 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 --- libavformat/dashenc.c | 2 +- libavformat/hlsenc.c | 26 ++++++++++++++++++++++++-- libavformat/hlsplaylist.c | 17 ++++++++++++++++- libavformat/hlsplaylist.h | 4 +++- 4 files changed, 44 insertions(+), 5 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) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index a0a3a4647b..d7b9c0e20a 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 @@ -1289,7 +1290,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"); @@ -1412,13 +1415,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); } } } @@ -1893,6 +1907,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) @@ -1960,6 +1975,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); @@ -2516,6 +2537,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); diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index 56244496c0..43f9d281ba 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -48,9 +48,22 @@ void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup, avio_printf(out, "URI=\"%s\"\n", filename); } +void ff_hls_write_subtitle_rendition(AVIOContext *out, char *sgroup, + const char *filename, char *language, int name_id, int is_default) { + if (!out || !filename) + return; + + avio_printf(out, "#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID=\"%s\"", sgroup); + avio_printf(out, ",NAME=\"subtitle_%d\",DEFAULT=%s,", name_id, is_default ? "YES" : "NO"); + if (language) { + avio_printf(out, "LANGUAGE=\"%s\",", language); + } + avio_printf(out, "URI=\"%s\"\n", filename); +} + void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, int bandwidth, const char *filename, char *agroup, - char *codecs, char *ccgroup) { + char *codecs, char *ccgroup, char *sgroup) { if (!out || !filename) return; @@ -71,6 +84,8 @@ void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, avio_printf(out, ",AUDIO=\"group_%s\"", agroup); if (ccgroup && ccgroup[0]) avio_printf(out, ",CLOSED-CAPTIONS=\"%s\"", ccgroup); + if (sgroup && sgroup[0]) + avio_printf(out, ",SUBTITLES=\"%s\"", sgroup); avio_printf(out, "\n%s\n\n", filename); } diff --git a/libavformat/hlsplaylist.h b/libavformat/hlsplaylist.h index a8d29d62d3..a124bdcffb 100644 --- a/libavformat/hlsplaylist.h +++ b/libavformat/hlsplaylist.h @@ -39,9 +39,11 @@ typedef enum { void ff_hls_write_playlist_version(AVIOContext *out, int version); void ff_hls_write_audio_rendition(AVIOContext *out, char *agroup, const char *filename, char *language, int name_id, int is_default); +void ff_hls_write_subtitle_rendition(AVIOContext *out, char *sgroup, + const char *filename, char *language, int name_id, int is_default); void ff_hls_write_stream_info(AVStream *st, AVIOContext *out, int bandwidth, const char *filename, char *agroup, - char *codecs, char *ccgroup); + char *codecs, char *ccgroup, char *sgroup); void ff_hls_write_playlist_header(AVIOContext *out, int version, int allowcache, int target_duration, int64_t sequence, uint32_t playlist_type, int iframe_mode); From patchwork Thu Mar 26 13:57:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 18415 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1BC36449BED for ; Thu, 26 Mar 2020 15:57:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0457B68B673; Thu, 26 Mar 2020 15:57:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 393F968B633 for ; Thu, 26 Mar 2020 15:57:11 +0200 (EET) Received: by mail-pl1-f177.google.com with SMTP id g18so2168437plq.0 for ; Thu, 26 Mar 2020 06:57:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bwDkFcN/PUVuCdP7RaN8YMPU3P4U7gfuijFD90FkgqA=; b=kH7+HOBmhYsjal0lVVA9HyJYyyxsmxCyWMJJ0YMqoN3ZjyZTTiPvRVsaLywFxmSeow +EBNrULpiX7UBqffR5IshglN2P9yGG7Vac9AUcAUuoc/ZA3WvESnOL47eWa/1QokU7eO 5oKUisFqLPj3jIn1kA5Mj3Wvjet6isIg32dlnTrHIKshD8MDgCJuOtHzD2qnw55y2X1O RAhbaoqK7KuGMjqOPxWDM6dSBng3W+/cYDQmrcGCRBuwohSrh1DN82v6Gf26yMgEboY3 oXNIucagOgHtrmH/NqfYFE9zOhhgCxScGbVpVTFP4Vv044T6JG+SPCO56tj1hTSFNsCD 32bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bwDkFcN/PUVuCdP7RaN8YMPU3P4U7gfuijFD90FkgqA=; b=nZVyy+UoPtywKkKx+6lWfvVXiu0FsKf9Z1XsR2lQiyVXj0GgiWUIMXrbntSdb8poYd hg3aUhLRJ5FO6X9MPvngmhw7ziRKEMmmul8yA0DJcXZl8aceqXizyq6mSeF03CargkxX pq1CRIH92C/vIvyHROqaDBzlLlJg8LgLkm4oGCvXy+eCQcYz8aXdZgKRDYN5Q3yH2Fxy 6P2WB2HZQE9vQAImLqRVN5byFkhMvcJMYTNh6EgG6dgNBc7dqfAnqHJqxBZPpcZyz6ug puWJhqEptM/BjfRqCFvuwGpP+0QNwWIto+ZOGA2V9G2rjEfZWAJUk/SvbXkaJzIVuBXW sSpg== X-Gm-Message-State: ANhLgQ2OYkWkBnkIusIBOCgTJmRYj7tVWRal8UkVj221Ts6zpHY1XLeT GUvyH5l1rNgR3bPULnG/5LXtQSt8 X-Google-Smtp-Source: ADFU+vsmgBMz+8pR4ll55xVT5DnCB8FkgiI/x/gc5eRCivAevD6RClA72VPv3h7jZsJbno/I/E/ljg== X-Received: by 2002:a17:90a:9501:: with SMTP id t1mr150221pjo.108.1585231029165; Thu, 26 Mar 2020 06:57:09 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b16sm1762439pfb.71.2020.03.26.06.57.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:57:08 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 21:57:00 +0800 Message-Id: <20200326135700.11167-4-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200326135700.11167-1-lance.lmwang@gmail.com> References: <20200326135700.11167-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 4/4] avformat/hlsenc: use av_asprintf() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index d7b9c0e20a..694dab42dd 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2950,13 +2950,11 @@ static int hls_init(AVFormatContext *s) if (ret < 0) goto fail; } else { - vs->vtt_m3u8_name = av_malloc(vtt_basename_size); + vs->vtt_m3u8_name = av_asprintf("%s_vtt.m3u8", vs->vtt_basename); if (!vs->vtt_m3u8_name) { ret = AVERROR(ENOMEM); goto fail; } - strcpy(vs->vtt_m3u8_name, vs->vtt_basename); - av_strlcat(vs->vtt_m3u8_name, "_vtt.m3u8", vtt_basename_size); } av_strlcat(vs->vtt_basename, vtt_pattern, vtt_basename_size); }