From 84ff940e227aa95e78a2c6c7e99aa1c7f0e85fd1 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Fri, 28 Apr 2017 16:29:02 -0700 Subject: [PATCH] Add init_segment name in --help Closes #228 Change-Id: I596ae7519632f269e8d3e9cfcf0e96564b248d01 --- packager/app/packager_main.cc | 6 +++--- packager/media/base/media_handler.h | 4 +--- packager/media/formats/webm/webm_content_encodings.h | 5 +++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/packager/app/packager_main.cc b/packager/app/packager_main.cc index eff0038aaa..cc2732202e 100644 --- a/packager/app/packager_main.cc +++ b/packager/app/packager_main.cc @@ -78,13 +78,13 @@ const char kUsage[] = "%s [flags] ...\n\n" " stream_descriptor consists of comma separated field_name/value pairs:\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" " URL.\n" " - stream_selector (stream): Required field with value 'audio',\n" " 'video', 'text', or stream number (zero based).\n" - " - output (out): Required output file (single file) or initialization\n" - " file path (multiple file).\n" + " - output (out,init_segment): Required output file (single file) or\n" + " initialization file path (multiple file).\n" " - segment_template (segment): Optional value which specifies the\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" diff --git a/packager/media/base/media_handler.h b/packager/media/base/media_handler.h index a8d20daa1c..7a8bdd481d 100644 --- a/packager/media/base/media_handler.h +++ b/packager/media/base/media_handler.h @@ -103,9 +103,6 @@ class MediaHandler { /// Validate if the stream at the specified index actually exists. 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 /// stream_data.stream_index should be the output stream index. Status Dispatch(std::unique_ptr stream_data); @@ -163,6 +160,7 @@ class MediaHandler { /// Flush the downstream connected at the specified 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 next_output_stream_index() const { return next_output_stream_index_; } const std::map, size_t>>& diff --git a/packager/media/formats/webm/webm_content_encodings.h b/packager/media/formats/webm/webm_content_encodings.h index 0a6f2c90b1..ed853a9999 100644 --- a/packager/media/formats/webm/webm_content_encodings.h +++ b/packager/media/formats/webm/webm_content_encodings.h @@ -72,14 +72,15 @@ class ContentEncoding { void set_cipher_mode(CipherMode mode) { cipher_mode_ = mode; } private: + ContentEncoding(const ContentEncoding&) = delete; + ContentEncoding& operator=(const ContentEncoding&) = delete; + int64_t order_; Scope scope_; Type type_; EncryptionAlgo encryption_algo_; std::string encryption_key_id_; CipherMode cipher_mode_; - - DISALLOW_COPY_AND_ASSIGN(ContentEncoding); }; } // namespace media