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

Add init_segment name in --help 

Closes #228

Change-Id: I596ae7519632f269e8d3e9cfcf0e96564b248d01
This commit is contained in:
KongQun Yang 2017-04-28 16:29:02 -07:00
parent 4a47268f3d
commit 84ff940e22
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packager/app/packager_main.cc
View File

@ -78,13 +78,13 @@ const char kUsage[] =
"%s [flags] <stream_descriptor> ...\n\n" "%s [flags] <stream_descriptor> ...\n\n"
" stream_descriptor consists of comma separated field_name/value pairs:\n" " stream_descriptor consists of comma separated field_name/value pairs:\n"
" field_name=value,[field_name=value,]...\n" " field_name=value,[field_name=value,]...\n"
" Supported field names are as follows:\n" " Supported field names are as follows (names in parenthesis are alias):\n"
" - input (in): Required input/source media file path or network stream\n" " - input (in): Required input/source media file path or network stream\n"
" URL.\n" " URL.\n"
" - stream_selector (stream): Required field with value 'audio',\n" " - stream_selector (stream): Required field with value 'audio',\n"
" 'video', 'text', or stream number (zero based).\n" " 'video', 'text', or stream number (zero based).\n"
" - output (out): Required output file (single file) or initialization\n" " - output (out,init_segment): Required output file (single file) or\n"
" file path (multiple file).\n" " initialization file path (multiple file).\n"
" - segment_template (segment): Optional value which specifies the\n" " - segment_template (segment): Optional value which specifies the\n"
" naming pattern for the segment files, and that the stream should be\n" " naming pattern for the segment files, and that the stream should be\n"
" split into multiple files. Its presence should be consistent across\n" " split into multiple files. Its presence should be consistent across\n"

4
packager/media/base/media_handler.h
View File

@ -103,9 +103,6 @@ class MediaHandler {
/// Validate if the stream at the specified index actually exists. /// Validate if the stream at the specified index actually exists.
virtual bool ValidateOutputStreamIndex(size_t stream_index) const; virtual bool ValidateOutputStreamIndex(size_t stream_index) const;
bool initialized() { return initialized_; }
size_t num_input_streams() { return num_input_streams_; }
/// Dispatch the stream data to downstream handlers. Note that /// Dispatch the stream data to downstream handlers. Note that
/// stream_data.stream_index should be the output stream index. /// stream_data.stream_index should be the output stream index.
Status Dispatch(std::unique_ptr<StreamData> stream_data); Status Dispatch(std::unique_ptr<StreamData> stream_data);
@ -163,6 +160,7 @@ class MediaHandler {
/// Flush the downstream connected at the specified output stream index. /// Flush the downstream connected at the specified output stream index.
Status FlushDownstream(size_t output_stream_index); Status FlushDownstream(size_t output_stream_index);
bool initialized() { return initialized_; }
size_t num_input_streams() const { return num_input_streams_; } size_t num_input_streams() const { return num_input_streams_; }
size_t next_output_stream_index() const { return next_output_stream_index_; } size_t next_output_stream_index() const { return next_output_stream_index_; }
const std::map<size_t, std::pair<std::shared_ptr<MediaHandler>, size_t>>& const std::map<size_t, std::pair<std::shared_ptr<MediaHandler>, size_t>>&

5
packager/media/formats/webm/webm_content_encodings.h
View File

@ -72,14 +72,15 @@ class ContentEncoding {
void set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; } void set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; }
private: private:
ContentEncoding(const ContentEncoding&) = delete;
ContentEncoding& operator=(const ContentEncoding&) = delete;
int64_t order_; int64_t order_;
Scope scope_; Scope scope_;
Type type_; Type type_;
EncryptionAlgo encryption_algo_; EncryptionAlgo encryption_algo_;
std::string encryption_key_id_; std::string encryption_key_id_;
CipherMode cipher_mode_; CipherMode cipher_mode_;
DISALLOW_COPY_AND_ASSIGN(ContentEncoding);
}; };
} // namespace media } // namespace media