[x265-commits] [x265] log: move logging of version and build info into libx265

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/9f77f0228735
branches:  
changeset: 6670:9f77f0228735
user:      Steve Borho <steve at borho.org>
date:      Fri Apr 04 13:26:40 2014 -0500
description:
log: move logging of version and build info into libx265

Now this data will be reported in the logs even when x265 is used as a shared or
static library
Subject: [x265] param: force bRepeatHeaders for the still picture profile

details:   http://hg.videolan.org/x265/rev/4bb0073e3d15
branches:  
changeset: 6671:4bb0073e3d15
user:      Steve Borho <steve at borho.org>
date:      Fri Apr 04 15:02:20 2014 -0500
description:
param: force bRepeatHeaders for the still picture profile
Subject: [x265] rest: fix the straw-man

details:   http://hg.videolan.org/x265/rev/aa1a86a1bd35
branches:  
changeset: 6672:aa1a86a1bd35
user:      Steve Borho <steve at borho.org>
date:      Fri Apr 04 16:32:34 2014 -0500
description:
rest: fix the straw-man

The two-argument command line doesn't work for YUV since you need to provide
the resolution and frame rate
Subject: [x265] rest: we don't abbreviate integer anywhere else

details:   http://hg.videolan.org/x265/rev/ac1bcf04c144
branches:  
changeset: 6673:ac1bcf04c144
user:      Steve Borho <steve at borho.org>
date:      Fri Apr 04 16:34:51 2014 -0500
description:
rest: we don't abbreviate integer anywhere else

diffstat:

 doc/reST/cli.rst        |  4 ++--
 source/common/param.cpp |  3 +++
 source/encoder/api.cpp  |  3 +++
 source/x265.cpp         |  1 -
 4 files changed, 8 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r ac9e57296fa8 -r ac1bcf04c144 doc/reST/cli.rst
--- a/doc/reST/cli.rst	Thu Apr 03 21:14:24 2014 -0500
+++ b/doc/reST/cli.rst	Fri Apr 04 16:34:51 2014 -0500
@@ -20,7 +20,7 @@ value) the CLI will treat it as the inpu
 makes the :option:`--input` specifier optional for the input file. If
 there are two extra arguments, the second is treated as the output
 bitstream filename, making :option:`--output` also optional if the input
-filename was implied. This makes :command:`x265 in.yuv out.hevc` a valid
+filename was implied. This makes :command:`x265 in.y4m out.hevc` a valid
 command line. If there are more than two extra arguments, the CLI will
 consider this an error and abort.
 
@@ -92,7 +92,7 @@ Standalone Executable Options
 	severe performance implications. Default is an autodetected count
 	based on the number of CPU cores and whether WPP is enabled or not.
 
-.. option:: --log-level <int|string>
+.. option:: --log-level <integer|string>
 
 	Logging level. Debug level enables per-frame QP, metric, and bitrate
 	logging. If a CSV file is being generated, debug level makes the log
diff -r ac9e57296fa8 -r ac1bcf04c144 source/common/param.cpp
--- a/source/common/param.cpp	Thu Apr 03 21:14:24 2014 -0500
+++ b/source/common/param.cpp	Fri Apr 04 16:34:51 2014 -0500
@@ -219,6 +219,9 @@ int x265_param_apply_profile(x265_param 
     }
     else if (!strcmp(profile, "mainstillpicture"))
     {
+        /* technically the stream should only have one picture, but we do not
+         * enforce this */
+        param->bRepeatHeaders = 1;
         param->keyframeMax = 1;
         param->bOpenGOP = 0;
     }
diff -r ac9e57296fa8 -r ac1bcf04c144 source/encoder/api.cpp
--- a/source/encoder/api.cpp	Thu Apr 03 21:14:24 2014 -0500
+++ b/source/encoder/api.cpp	Fri Apr 04 16:34:51 2014 -0500
@@ -34,6 +34,9 @@ x265_encoder *x265_encoder_open(x265_par
     if (!param)
         return NULL;
 
+    x265_log(param, X265_LOG_INFO, "HEVC encoder version %s\n", x265_version_str);
+    x265_log(param, X265_LOG_INFO, "build info %s\n", x265_build_info_str);
+
     x265_setup_primitives(param, param->cpuid);
 
     if (x265_check_params(param))
diff -r ac9e57296fa8 -r ac1bcf04c144 source/x265.cpp
--- a/source/x265.cpp	Thu Apr 03 21:14:24 2014 -0500
+++ b/source/x265.cpp	Fri Apr 04 16:34:51 2014 -0500
@@ -648,7 +648,6 @@ bool CLIOptions::parse(int argc, char **
         return true;
     }
 
-    printVersion(param);
     return false;
 }