Changeset 21ae55dcaa809e0f5e6b6e424a6ce2f77966ad19

Timestamp:

19/08/06 23:32:19 (2 years ago)

Author:

Dennis van Amerongen <trax@videolan.org>

git-committer:

Dennis van Amerongen <trax@videolan.org> 1156023139 +0000

git-parent:

[3189c99ddc42c7e0b4289b28d1efc99d67c1167e]

git-author:

Dennis van Amerongen <trax@videolan.org> 1156023139 +0000

Message:

* modules/codec/x264.c: cosmetics and added SSIM stats computation option.

Files:

• modules/codec/x264.c (modified) (21 diffs)

modules/codec/x264.c

@@ -44 +44 @@
-#define KEYINT_TEXT N_("Maximum GOP size")
-#define KEYINT_LONGTEXT N_( "Sets maximum interval between IDR-frames." \
-
-
+  
+  
-
-#define MIN_KEYINT_TEXT N_("Minimum GOP size")
@@ -51 +51 @@
-    "In H.264, I-frames do not necessarily bound a closed GOP because it is " \
-    "allowable for a P-frame to be predicted from more frames than just the " \
-frameref). Therefore, I-frames are not
-necessarily seekable. IDR-Frames restrict subsequent P-frames from
-referring to any frame prior to the IDR-F
+reference frame option). Therefore,
+I-frames are not necessarily seekable. IDR-frames restrict subsequent
+P-frames from referring to any frame prior to the IDR-f
-    "If scenecuts appear within this interval, they are still encoded as " \
-    "I-frames, but do not start a new GOP." )
-
-F
+f
-#define SCENE_LONGTEXT N_( "Scene-cut detection. Controls how " \
-    "aggressively to insert extra I-frames. With small values of " \
@@ -65 +65 @@
-    "I-frame. Large values use more I-frames " \
-    "than necessary, thus wasting bits. -1 disables scene-cut detection, so " \
-be 
-(1-100)
+
+Range 1 to 100
-
-#define BFRAMES_TEXT N_("B-frames between I and P")
-#define BFRAMES_LONGTEXT N_( "Number of consecutive B-frames between I and " \
-
-
-
+
+
-#define B_ADAPT_TEXT N_("Adaptive B-frame decision")
-#define B_ADAPT_LONGTEXT N_( "Force the specified number of " \
-
-
-
+
+
-#define B_BIAS_TEXT N_("B-frames usage")
-#define B_BIAS_LONGTEXT N_( "Bias the choice to use B-frames. Positive values " \
- 
+
-
-#define BPYRAMID_TEXT N_("Keep some B-frames as references")
@@ -90 +88 @@
-#define CABAC_LONGTEXT N_( "CABAC (Context-Adaptive Binary Arithmetic "\
-    "Coding). Slightly slows down encoding and decoding, but should save " \
--
-
+ to 
+
-#define REF_TEXT N_("Number of reference frames")
-#define REF_LONGTEXT N_( "Number of previous frames used as predictors. " \
-    "This is effective in Anime, but seems to make little difference in " \
-    "live-action source material. Some decoders are unable to deal with " \
-From 1 to 16
+Range 1 to 16.
-
-#define NF_TEXT N_("Skip loop filter")
@@ -111 +109 @@
-#define QP_LONGTEXT N_( "This selects the quantizer to use. " \
-    "Lower values result in better fidelity, but higher bitrates. 26 is a " \
-
-
-
+
+
-#define CRF_TEXT N_("Quality-based VBR")
-From 0 to 51
+Range 0 to 51.
-
-#define QPMIN_TEXT N_("Min QP")
-
-
-
-
+
+
+
-#define QPMAX_TEXT N_("Max QP")
-#define QPMAX_LONGTEXT N_( "Maximum quantizer parameter." )
@@ -129 +125 @@
-
-#define RATETOL_TEXT N_("Average bitrate tolerance")
-.
+
-    "bitrate (in kbits/s).")
-
-#define VBV_MAXRATE_TEXT N_("Max local bitrate")
-in kbits/s
+(in kbits/s)
-
-#define VBV_BUFSIZE_TEXT N_("VBV buffer")
-#define VBV_BUFSIZE_LONGTEXT N_( "Averaging period for the maximum " \
-in kbits
+(in kbits)
-
-#define VBV_INIT_TEXT N_("Initial VBV buffer occupancy")
-#define VBV_INIT_LONGTEXT N_( "Sets the initial buffer occupancy as a " \
-
-
+
+
+
-#define IPRATIO_TEXT N_("QP factor between I and P")
-
-
+
+
+
-#define PBRATIO_TEXT N_("QP factor between P and B")
-
+ Range 1.0 to 2.0.
-
-#define CHROMA_QP_OFFSET_TEXT N_("QP difference between chroma and luma")
@@ -153 +151 @@
-
-#define QCOMP_TEXT N_("QP curve compression")
-(0.0=CBR to 1.0=QCP)
+Range 0.0 (CBR) to 1.0 (QCP).
-
-#define CPLXBLUR_TEXT N_("Reduce fluctuations in QP")
-#define CPLXBLUR_LONGTEXT N_( "This reduces the fluctuations in QP " \
-            
+
-
-#define QBLUR_TEXT N_("Reduce fluctuations in QP")
-#define QBLUR_LONGTEXT N_( "This reduces the fluctations in QP " \
-                    
+
-
-/* Analysis */
@@ -174 +172 @@
-    "(p4x4 requires p8x8. i8x8 requires 8x8dct).")
-
-/// \bug [String] Extra space
-#define DIRECT_PRED_TEXT N_("Direct MV prediction mode")
- 
+
-
-#define WEIGHTB_TEXT N_("Weighted prediction for B-frames")
@@ -191 +188 @@
-#define MERANGE_LONGTEXT N_( "Maximum distance to search for " \
-    "motion estimation, measured from predicted position(s). " \
-
-
-
+
+
-
-#define SUBME_TEXT N_("Subpixel motion estimation and partition decision " \
@@ -214 +210 @@
-#endif
-
-.
+
-#define B_RDO_LONGTEXT N_( "RD based mode decision for B-frames. This " \
-                    "requires subme 6
+"requires subme 6 (or higher)
-
-#define MIXED_REFS_TEXT N_("Decide references on a per partition basis")
-#define MIXED_REFS_LONGTEXT N_( "Allows each 8x8 or 16x8 partition to " \
- "independently
- "select a reference frame, as opposed to only one ref 
+"independently select a reference frame, as opposed to only one ref
+"
-
-#define CHROMA_ME_TEXT N_("Ignore chroma in motion estimation")
-#define CHROMA_ME_LONGTEXT N_( "Chroma ME for subpel and mode decision in " \
-            
+
-
-#define BIME_TEXT N_("Jointly optimize both MVs in B-frames")
@@ -232 +228 @@
-#define TRANSFORM_8X8DCT_TEXT N_("Adaptive spatial transform size")
-#define TRANSFORM_8X8DCT_LONGTEXT N_( \
-    
+
-
-#define TRELLIS_TEXT N_("Trellis RD quantization" )
-#define TRELLIS_LONGTEXT N_( "Trellis RD quantization: \n" \
- 
- 
- 
- 
+
+
+
+
-
-#define FAST_PSKIP_TEXT N_("Early SKIP detection on P-frames")
@@ -248 +244 @@
-    "Eliminate dct blocks containing only a small single coefficient.")
-
+/* Noise reduction 1 is too weak to measure, suggest at least 10 */
-#define NR_TEXT N_("Noise reduction")
-
+
+
-
-/* Input/Output */
@@ -256 +254 @@
-#define ASM_LONGTEXT N_( "Use assembler CPU optimizations.")
-
-
-
-
+
+
+
+
+
+
+
-
-#define QUIET_TEXT N_("Quiet mode")
@@ -385 +387 @@
-    add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT,
-               IPRATIO_LONGTEXT, VLC_FALSE );
-0, 100
+1, 2
-
-    add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT,
-               PBRATIO_LONGTEXT, VLC_FALSE );
-0, 100
+1, 2
-
-#if X264_BUILD >= 23 /* r190 */
@@ -481 +483 @@
-    add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT,
-                 NR_LONGTEXT, VLC_FALSE );
+        change_integer_range( 0, 1000 );
-#endif
-
@@ -488 +491 @@
-              ASM_LONGTEXT, VLC_FALSE );
-
-alcul
+omput
-    add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT,
-              PSNR_LONGTEXT, VLC_FALSE );
+
+#if X264_BUILD >= 50 /* r554 */
+    /* x264 ssim = 1 (default). disable SSIM computation for speed. */
+    add_bool( SOUT_CFG_PREFIX "ssim", 0, NULL, SSIM_TEXT,
+              SSIM_LONGTEXT, VLC_FALSE );
+#endif
-
-    add_bool( SOUT_CFG_PREFIX "quiet", 0, NULL, QUIET_TEXT,
@@ -512 +521 @@
-    "min-keyint", "mixed-refs", "nf", "nr", "pbratio", "psnr", "qblur",
-    "qp", "qcomp", "qpstep", "qpmax", "qpmin", "qp-max", "qp-min", "quiet",
-
+sim", "s
-    "trellis", "verbose", "vbv-bufsize", "vbv-init", "vbv-maxrate",
-    "weightb", NULL
@@ -650 +659 @@
-    var_Get( p_enc, SOUT_CFG_PREFIX "nf", &val );
-    p_sys->param.b_deblocking_filter = !val.b_bool;
-
+
-    var_Get( p_enc, SOUT_CFG_PREFIX "filter", &val );
-    if( val.psz_string )
@@ -769 +778 @@
-    p_sys->param.analyse.b_psnr = val.b_bool;
-
+#if X264_BUILD >= 50 /* r554 */
+    var_Get( p_enc, SOUT_CFG_PREFIX "ssim", &val );
+    p_sys->param.analyse.b_ssim = val.b_bool;
+#endif
+
-#if X264_BUILD >= 0x0012
-    var_Get( p_enc, SOUT_CFG_PREFIX "weightb", &val );
@@ -829 +843 @@
-#if X264_BUILD >= 44
-    var_Get( p_enc, SOUT_CFG_PREFIX "nr", &val );
-
+
+
-#endif
-
@@ -925 +940 @@
-
-#if X264_BUILD >= 29
+    /* As of r543 x264 will autodetect the number of cpus and will set
+       the number of threads accordingly unless ofcourse the number of
+       threads is explicitly specified... */
-    if( p_enc->i_threads >= 1 )
-        p_sys->param.i_threads = p_enc->i_threads;