[x265-commits] [x265] api: add param.bRepeatHeaders - insert stream headers in ...

Steve Borho steve at borho.org
Tue Mar 25 18:54:57 CET 2014


details:   http://hg.videolan.org/x265/rev/e739e579609a
branches:  
changeset: 6582:e739e579609a
user:      Steve Borho <steve at borho.org>
date:      Tue Mar 25 11:43:02 2014 -0500
description:
api: add param.bRepeatHeaders - insert stream headers in each keyframe NAL

This is apparently useful for raw stream formats
Subject: [x265] Add reST script to generate x265 user manual

details:   http://hg.videolan.org/x265/rev/a1d9b54e57d2
branches:  stable
changeset: 6583:a1d9b54e57d2
user:      Sagar Kotecha <sagar at multicorewareinc.com>
date:      Tue Mar 25 18:26:55 2014 +0530
description:
Add reST script to generate x265 user manual
Subject: [x265] Merge with stable

details:   http://hg.videolan.org/x265/rev/fd5e313eca45
branches:  
changeset: 6584:fd5e313eca45
user:      Steve Borho <steve at borho.org>
date:      Tue Mar 25 12:43:08 2014 -0500
description:
Merge with stable
Subject: [x265] rest: add Makefile for generating HTML from reST, cleanup some nits

details:   http://hg.videolan.org/x265/rev/c52c2f8c3e32
branches:  
changeset: 6585:c52c2f8c3e32
user:      Steve Borho <steve at borho.org>
date:      Tue Mar 25 12:54:41 2014 -0500
description:
rest: add Makefile for generating HTML from reST, cleanup some nits

diffstat:

 doc/reST/Makefile               |   97 ++++++
 doc/reST/cli.rst                |  590 ++++++++++++++++++++++++++++++++++++++++
 doc/reST/conf.py                |   17 +
 doc/reST/index.rst              |    7 +
 doc/reST/introduction.rst       |   52 +++
 source/CMakeLists.txt           |    2 +-
 source/common/common.h          |    2 +-
 source/common/param.cpp         |    1 +
 source/encoder/api.cpp          |    2 +-
 source/encoder/frameencoder.cpp |    7 +-
 source/x265.cpp                 |    5 +-
 source/x265.h                   |    4 +
 12 files changed, 779 insertions(+), 7 deletions(-)

diffs (truncated from 884 to 300 lines):

diff -r 4318d47d9348 -r c52c2f8c3e32 doc/reST/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/reST/Makefile	Tue Mar 25 12:54:41 2014 -0500
@@ -0,0 +1,97 @@
+# Makefile for (Sphinx based) restructured text documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS    =
+SPHINXBUILD   = sphinx-build
+PAPER         =
+
+QCOLLECTIONGENERATOR = qcollectiongenerator
+
+# Internal variables.
+PAPEROPT_a4     = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS   = -d build/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html web pickle htmlhelp qthelp qhc latex changes linkcheck
+
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  html      to make standalone HTML files"
+	@echo "  pickle    to make pickle files"
+	@echo "  json      to make JSON files"
+	@echo "  htmlhelp  to make HTML files and a HTML help project"
+	@echo "  qthelp    to make HTML files and a qthelp project"
+	@echo "  qhc       to make QHC file"
+	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  changes   to make an overview over all changed/added/deprecated items"
+	@echo "  linkcheck to check all external links for integrity"
+
+clean:
+	-rm -rf build/*
+
+html:
+	mkdir -p build/html build/doctrees
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) build/html
+	@echo
+	@echo "Build finished. The HTML pages are in build/html."
+
+zip: html
+	(cd build ; zip TortoiseHg.html.zip -r html)
+
+pickle:
+	mkdir -p build/pickle build/doctrees
+	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) build/pickle
+	@echo
+	@echo "Build finished; now you can process the pickle files."
+
+web: pickle
+
+json:
+	mkdir -p build/json build/doctrees
+	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) build/json
+	@echo
+	@echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+	mkdir -p build/htmlhelp build/doctrees
+	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) build/htmlhelp
+	@echo
+	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	      ".hhp project file in build/htmlhelp."
+
+qthelp:
+	mkdir -p build/qthelp build/doctrees
+	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) build/qthelp
+	@echo
+	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	      ".qhcp project file in build/qthelp, like this:"
+	@echo "# qcollectiongenerator build/qthelp/foo.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile build/qthelp/foo.qhc"
+
+qhc: qthelp
+	$(QCOLLECTIONGENERATOR) build/qthelp/TortoiseHg.qhcp
+	@echo "Build finished. To view the help file:"
+	@echo "# assistant -collectionFile build/qthelp/TortoiseHg.qhc"
+
+latex:
+	mkdir -p build/latex build/doctrees
+	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) build/latex
+	@echo
+	@echo "Build finished; the LaTeX files are in build/latex."
+	@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
+	      "run these through (pdf)latex."
+
+changes:
+	mkdir -p build/changes build/doctrees
+	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) build/changes
+	@echo
+	@echo "The overview file is in build/changes."
+
+linkcheck:
+	mkdir -p build/linkcheck build/doctrees
+	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) build/linkcheck
+	@echo
+	@echo "Link check complete; look for any errors in the above output " \
+	      "or in build/linkcheck/output.txt."
diff -r 4318d47d9348 -r c52c2f8c3e32 doc/reST/cli.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/reST/cli.rst	Tue Mar 25 12:54:41 2014 -0500
@@ -0,0 +1,590 @@
+*********************
+Command line Options
+*********************
+
+Standalone Executable Options
+=============================
+
+.. option:: --help/-h
+
+   Display help text
+
+.. option:: --version/-V
+
+   Display version details
+
+.. option:: --cpuid
+   
+   Limit SIMD capability bitmap
+   
+   **Values:**  0:auto **(Default)**; 1:none
+   
+.. option:: --threads
+   
+   Number of threads for thread pool; 0: detect CPU core count **(Default)**
+   
+.. option:: --preset/-p
+   
+   Sets parameters to preselected values, trading off compression efficiency against 
+   encoding speed. These parameters are applied before all other input parameters are 
+   applied, and so you can override any parameters that these values control.   
+   
+   **Values:**  ultrafast, superfast, veryfast, faster, fast, medium **(Default)**, slow, slower, veryslow, placebo
+
+.. option:: --tune/-t
+
+   Tune the settings for a particular type of source or situation. The changes will
+   be applied after --preset but before all other parameters.
+   
+   **Values:** psnr, ssim **(Default)**, zero-latency.
+
+.. option:: --frame-threads/-F
+    
+   Number of concurrently encoded frames
+  
+   **Range of values:** >=0.  **Default** = auto-determined from a formula based on the number of CPU cores
+
+.. option::--log
+    
+   Logging level
+
+   **Values:**  0:ERROR; 1:WARNING; 2:INFO **(Default)**; 3:DEBUG; 4:FULL -1:NONE
+
+.. option:: --log 3
+
+   produces a log file that records results per frame
+
+.. option:: --output/-o
+
+   Bitstream output file name
+
+.. option:: --no-progress
+
+   Disable per-frame encoding progress reporting
+
+.. option:: --csv <filename>
+
+   Writes encoding results to a comma separated value log file
+   Creates the file if it doesnt already exist, else adds one line per run
+
+.. option:: --y4m
+    
+   Parse input stream as YUV4MPEG2 regardless of file extension
+
+------------------------------
+
+Input Options
+=============
+
+.. option:: --input
+
+    Raw YUV or Y4M input file name
+
+.. option:: --input-depth
+
+    Bit-depth of input file (YUV only).
+
+    **Values:** any value between 8 and 16. Default is internal depth.
+
+.. option:: --input-res
+
+    Source picture size [w x h], auto-detected if Y4M
+
+.. option:: --input-csp
+
+    Source color space parameter, auto detected if Y4M;
+
+    **Values:** 1:"i420" **(Default)**, or 3:"i444"
+
+.. option:: --fps
+
+    Source frame rate; auto-detected if Y4M;
+
+    **Range of values:** positive int or float, or num/denom
+
+.. option:: --seek
+    
+    Number of frames to skip at start of input file
+
+    **Range of values:** 0 to the number of frames in the video
+    **Default**: 0
+
+.. option:: --frames/-f
+
+    Number of frames to be encoded; 0 implies all **(Default)**
+
+    **Range of values:** 0 to the number of frames in the video
+
+------------------------------
+
+Reconstructed video options (debugging)
+=======================================
+
+.. option:: --recon/-r
+
+    Re-constructed image YUV or Y4M output file name
+
+.. option:: --recon-depth
+
+    Bit-depth of output file 
+
+    **Default:** same as input bit depth
+
+Quad-Tree analysis
+==================
+
+.. option:: --no-wpp
+
+    Disable Wavefront Parallel Processing
+
+.. option:: --wpp
+
+    Enable Wavefront Parallel Processing **(Default)**
+
+.. option:: --ctu/-s
+
+    Maximum CU size (width and height)
+   
+    **Values:** 16, 32, 64 **(Default)**
+
+.. option:: --tu-intra-depth
+
+    Max TU recursive depth for intra CUs
+   
+    **Values:** 1 **(Default)**, 2, 3, 4
+
+.. option:: --tu-inter-depth
+
+    Max TU recursive depth for inter CUs 
+   
+    **Values:** 1 **(Default)**, 2, 3, 4
+
+------------------------------   
+
+Temporal / motion search options
+================================
+
+.. option:: --me
+
+    Motion search method 0: dia; 1: hex **(Default)**; 2: umh; 3: star; 4: full
+
+.. option:: --subme/-m
+
+    Amount of subpel refinement to perform
+
+    **Range of values:** an integer from 0 to 7 (0: least..7: most)
+    **Default: 2**
+
+.. option:: --merange
+
+    Motion search range
+
+    **Range of values:** an integer from 0 to 32768
+    **Default: 57**
+
+.. option:: --no-rect
+
+    Disable rectangular motion partitions Nx2N and 2NxN
+
+.. option:: --rect
+
+    Enable rectangular motion partitions Nx2N and 2NxN **(Default)**
+
+.. option:: --no-amp
+
+    Disable asymmetric motion partitions


More information about the x265-commits mailing list