Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Doc] Fix a few problems 

- Add --time_shift_buffer_depth to HLS doc.
- Fix a problem in HLS tutorial

Partially address #304, fixes #305

Change-Id: I60bc1eb659a30beb0a6ab73433f4cc99a7deab07
This commit is contained in:
KongQun Yang 2017-12-20 12:26:23 -08:00
parent c03c447e0b
commit fcc334d652
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/source/options/hls_options.rst
View File

@ -21,3 +21,8 @@ HLS options
VOD, EVENT, or LIVE. This defines the EXT-X-PLAYLIST-TYPE in the HLS VOD, EVENT, or LIVE. This defines the EXT-X-PLAYLIST-TYPE in the HLS
specification. For hls_playlist_type of LIVE, EXT-X-PLAYLIST-TYPE tag is specification. For hls_playlist_type of LIVE, EXT-X-PLAYLIST-TYPE tag is
omitted. omitted.
--time_shift_buffer_depth <seconds>
Guaranteed duration of the time shifting buffer for LIVE playlist, in
seconds.

10
docs/source/tutorials/hls.rst
View File

@ -46,11 +46,11 @@ The examples below uses the H264 streams created in :doc:`encoding`.
* TS output:: * TS output::
$ packager \ $ packager \
'in=h264_baseline_360p_600.mp4,stream=audio,output=audio_$Number$.ts,playlist_name=audio.m3u8,hls_group_id=audio,hls_name=ENGLISH' \ 'in=h264_baseline_360p_600.mp4,stream=audio,segment_template=audio_$Number$.ts,playlist_name=audio.m3u8,hls_group_id=audio,hls_name=ENGLISH' \
'in=h264_baseline_360p_600.mp4,stream=video,output=h264_360p_$Number$.ts,playlist_name=h264_360p.m3u8' \ 'in=h264_baseline_360p_600.mp4,stream=video,segment_template=h264_360p_$Number$.ts,playlist_name=h264_360p.m3u8' \
'in=h264_main_480p_1000.mp4,stream=video,output=h264_480p_$Number$.ts,playlist_name=h264_480p.m3u8' \ 'in=h264_main_480p_1000.mp4,stream=video,segment_template=h264_480p_$Number$.ts,playlist_name=h264_480p.m3u8' \
'in=h264_main_720p_3000.mp4,stream=video,output=h264_720p_$Number$.ts,playlist_name=h264_720p.m3u8' \ 'in=h264_main_720p_3000.mp4,stream=video,segment_template=h264_720p_$Number$.ts,playlist_name=h264_720p.m3u8' \
'in=h264_high_1080p_6000.mp4,stream=video,output=h264_1080p_$Number$.ts,playlist_name=h264_1080p.m3u8' \ 'in=h264_high_1080p_6000.mp4,stream=video,segment_template=h264_1080p_$Number$.ts,playlist_name=h264_1080p.m3u8' \
--hls_master_playlist_output h264_master.m3u8 --hls_master_playlist_output h264_master.m3u8
The above packaging command creates five single track TS streams The above packaging command creates five single track TS streams

7
packager/app/packager_main.cc
View File

@ -96,9 +96,10 @@ const char kUsage[] =
" EXT-X-MEDIA. Defaults to the base of the playlist name.\n" " EXT-X-MEDIA. Defaults to the base of the playlist name.\n"
" - hls_group_id: Used for HLS audio to set the GROUP-ID attribute for\n" " - hls_group_id: Used for HLS audio to set the GROUP-ID attribute for\n"
" EXT-X-MEDIA. Defaults to 'audio' if not specified.\n" " EXT-X-MEDIA. Defaults to 'audio' if not specified.\n"
" - playlist_name: Used for HLS video. The name of the playlist to create.\n" " - playlist_name: The HLS playlist file to create. Usually ends with\n"
" Usually ends with '.m3u8'. If unspecified, defaults to something of\n" " '.m3u8', and is relative to --hls_master_playlist_output. If\n"
" the form 'stream_0.m3u8', 'stream_1.m3u8', 'stream_2.m3u8', etc.\n"; " unspecified, defaults to something of the form 'stream_0.m3u8',\n"
" 'stream_1.m3u8', 'stream_2.m3u8', etc.\n";
// Labels for parameters in RawKey key info. // Labels for parameters in RawKey key info.
const char kDrmLabelLabel[] = "label"; const char kDrmLabelLabel[] = "label";