From patchwork Fri Jun 28 15:06:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13750 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 D1D924498F0 for ; Fri, 28 Jun 2019 18:15:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A830168AB41; Fri, 28 Jun 2019 18:15:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F4F068A568 for ; Fri, 28 Jun 2019 18:15:17 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id p10so2735226pgn.1 for ; Fri, 28 Jun 2019 08:15:16 -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=JF3STD9+IvnLYWBkiPtPSzoaiG7TlCKYJmX50eshPCk=; b=gCx+/lhcbmhDw9L0ru7ouRJlFRlWgtYRXrok/ByjAoBffFvFJqROWuu9DwyQQg24xU rpDRUs4I0iPH6qgjIlLbD03aoe/xXBq0bt/CYAcWkkxpa3CbMgHA8Io1RRAXpziLVOUF 2K7tHA8jNi1CgrSgTLAfAr6t1gtR3GH0iZWAMdKvLfIvH9KjTBzGeAwzn2CE6ZOl7sVj 0CiRP6r69ZSuUouG0YtXdBjK2iRFaZ6cudvxDi89PjrTHisIPcedUr/UtHuQ7QbwQ1mQ rsk6fWTQQjHpNM/ZP3Np7N5xoI/gs7E+qPxFh3dE4Ec8r0pkocvo1nMpg5SKV2/NmYO9 C8DQ== 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=JF3STD9+IvnLYWBkiPtPSzoaiG7TlCKYJmX50eshPCk=; b=GduH3FMabF+lDWLCd6yhkb2s2X6R8G3+MOuWCGd3xJghRRzSZ9M5ht/uzfcUsbfQS1 uFOQhdzLRjvTmPOWE/qBGL2O3VM1fcN9VQnqFjDlk0XGztEgTcpOHaeH5lefCGp5uCs+ BlnfKK8kSwtoM+1/By9nrf9gY5ZaAuI9Hmnlk91exTIg3vmi2Z5ZiN769Y/ZJUcCWjuZ VzxuHUdzJ/+YexRgwgV5p7Om7jQxpZY4CFu3Qa1EoI44u8ze+cf3M2a66u4SllFV7VRX 1xaNM3/zPfNb5i9QnVe3hsmHk/8PYXW1KFRG0+AUNNU4GLs+KDOLHytLoVzuQwrMfneg Hc1w== X-Gm-Message-State: APjAAAWV9FeH4k9hv3dv1JqbJuVqDtKu6T7i8xIwqsSepzFb5eerhbs9 atULRusPdIfa/va4L3+AS6rjFnlW X-Google-Smtp-Source: APXvYqzXLaZPhRHGmTEmr06yPORemTRwSsme90uDvqk4PNAlrC1380Z5UlHttcJxonYwM1b6w/rfGA== X-Received: by 2002:a17:90b:f0f:: with SMTP id br15mr13963677pjb.101.1561734416271; Fri, 28 Jun 2019 08:06:56 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id b3sm4114525pfp.65.2019.06.28.08.06.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jun 2019 08:06:55 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2019 23:06:46 +0800 Message-Id: <1561734407-28716-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1561734407-28716-1-git-send-email-mypopydev@gmail.com> References: <1561734407-28716-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 1/2] doc/muxers: fix and update docs for HLS muxer 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao fix and update docs for HLS muxer Signed-off-by: Jun Zhao --- doc/muxers.texi | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index dd64672..d179584 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -525,7 +525,7 @@ See also the @ref{framehash} muxer. @anchor{hls} @section hls -Apple HTTP Live Streaming muxer that segments MPEG-TS according to +Apple HTTP Live Streaming muxer that segments MPEG-TS/fragmented MP4 according to the HTTP Live Streaming (HLS) specification. It creates a playlist file, and one or more segment files. The output filename @@ -767,20 +767,20 @@ ffmpeg -f lavfi -re -i testsrc -c:v h264 -hls_flags delete_segments \ -hls_key_info_file file.keyinfo out.m3u8 @end example -@item -hls_enc @var{enc} +@item hls_enc @var{enc} Enable (1) or disable (0) the AES128 encryption. When enabled every segment generated is encrypted and the encryption key is saved as @var{playlist name}.key. -@item -hls_enc_key @var{key} +@item hls_enc_key @var{key} Hex-coded 16byte key to encrypt the segments, by default it is randomly generated. -@item -hls_enc_key_url @var{keyurl} +@item hls_enc_key_url @var{keyurl} If set, @var{keyurl} is prepended instead of @var{baseurl} to the key filename in the playlist. -@item -hls_enc_iv @var{iv} +@item hls_enc_iv @var{iv} Hex-coded 16byte initialization vector for every segment instead of the autogenerated ones. @@ -901,14 +901,22 @@ are always written into temporary file regardles of this flag if @code{master_pl @end table -@item hls_playlist_type event +@item hls_playlist_type @var{int} +Set the HLS playlist type, Default value is 0. + +Other possible values: +@table @option + +@item event Emit @code{#EXT-X-PLAYLIST-TYPE:EVENT} in the m3u8 header. Forces @option{hls_list_size} to 0; the playlist can only be appended to. -@item hls_playlist_type vod +@item vod Emit @code{#EXT-X-PLAYLIST-TYPE:VOD} in the m3u8 header. Forces @option{hls_list_size} to 0; the playlist must not change. +@end table + @item method Use the given HTTP method to create the hls files. @example @@ -1090,7 +1098,7 @@ Use persistent HTTP connections. Applicable only for HTTP output. @item timeout Set timeout for socket I/O operations. Applicable only for HTTP output. -@item -ignore_io_errors +@item ignore_io_errors Ignore IO errors during open, write and delete. Useful for long-duration runs with network output. @item headers