Codecs (except x264). Refs:#438

diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c
index 6588771f49dcf65be3696f22f307d4fe552b173f..4072432a6e298b744e511e059d2c83c8e979c130 100644 (file)
--- a/modules/codec/dvbsub.c
+++ b/modules/codec/dvbsub.c
@@ -42,27 +42,27 @@
 
 /* #define DEBUG_DVBSUB 1 */
 
-#define POSX_TEXT N_("X coordinate of the subpicture")
-#define POSX_LONGTEXT N_("You can reposition the subpicture by providing another value here." )
+#define POSX_TEXT N_("Decoding X coordinate")
+#define POSX_LONGTEXT N_("X coordinate of the rendered subtitle")
 
-#define POSY_TEXT N_("Y coordinate of the subpicture")
-#define POSY_LONGTEXT N_("You can reposition the subpicture by providing another value here." )
+#define POSY_TEXT N_("Decoding Y coordinate")
+#define POSY_LONGTEXT N_("Y coordinate of the rendered subtitle") 
 
 #define POS_TEXT N_("Subpicture position")
 #define POS_LONGTEXT N_( \
   "You can enforce the subpicture position on the video " \
   "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
-  "also use combinations of these values (e.g. 6=top-right)).")
+  "also use combinations of these values, e.g. 6=top-right).")
 
-#define ENC_POSX_TEXT N_("X coordinate of the encoded subpicture")
-#define ENC_POSX_LONGTEXT N_("You can reposition the subpicture by providing another value here." )
+#define ENC_POSX_TEXT N_("Encoding X coordinate")
+#define ENC_POSX_LONGTEXT N_("X coordinate of the encoded subtitle" )
+#define ENC_POSY_TEXT N_("Encoding Y coordinate")
+#define ENC_POSY_LONGTEXT N_("Y coordinate of the encoded subtitle" )
 
-#define ENC_POSY_TEXT N_("Y coordinate of encoded the subpicture")
-#define ENC_POSY_LONGTEXT N_("You can reposition the subpicture by providing another value here." )
-
-#define TIMEOUT_TEXT N_("Timeout of subpictures")
+#define TIMEOUT_TEXT N_("Timeout")
 #define TIMEOUT_LONGTEXT N_( \
-    "Subpictures get a default timeout of 15 seconds added to their remaining time." \
+    "Subpictures get a default timeout of 15 seconds added to their " \
+    "remaining time." \
     "This will ensure that they are at least the specified time visible.")
 
 static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };

diff --git a/modules/codec/fake.c b/modules/codec/fake.c
index 6bf8347ce849cb2d788bd7bc6cfb2144387a8e73..be899579a27d512083a86fed5f5c99e922c8cfc0 100644 (file)
--- a/modules/codec/fake.c
+++ b/modules/codec/fake.c
@@ -44,25 +44,25 @@ static picture_t *DecodeBlock  ( decoder_t *, block_t ** );
  *****************************************************************************/
 #define FILE_TEXT N_("Image file")
 #define FILE_LONGTEXT N_( \
-    "Path of the image file when using the fake input." )
+    "Path of the image file for fake input." )
 #define WIDTH_TEXT N_("Video width")
 #define WIDTH_LONGTEXT N_( \
-    "Allows you to specify the output video width." )
+    "Output video width." )
 #define HEIGHT_TEXT N_("Video height")
 #define HEIGHT_LONGTEXT N_( \
-    "Allows you to specify the output video height." )
+    "Output video height." )
 #define KEEP_AR_TEXT N_("Keep aspect ratio")
 #define KEEP_AR_LONGTEXT N_( \
-    "If selected, width and height will be considered as maximum values." )
+    "Consider width and height as maximum values." )
 #define ASPECT_RATIO_TEXT N_("Background aspect ratio")
 #define ASPECT_RATIO_LONGTEXT N_( \
     "Aspect ratio of the image file (4:3, 16:9). Default is square pixels." )
 #define DEINTERLACE_TEXT N_("Deinterlace video")
 #define DEINTERLACE_LONGTEXT N_( \
-    "Allows you to deinterlace the image after loading." )
+    "Deinterlace the image after loading it." )
 #define DEINTERLACE_MODULE_TEXT N_("Deinterlace module")
 #define DEINTERLACE_MODULE_LONGTEXT N_( \
-    "Specifies the deinterlace module to use." )
+    "Deinterlace module to use." )
 
 static char *ppsz_deinterlace_type[] =
 {

diff --git a/modules/codec/ffmpeg/ffmpeg.h b/modules/codec/ffmpeg/ffmpeg.h
index da36da05c0b777f2f0c32605498be96ed064c978..a660586285f0d5426acc1ea25b2d34276df92eab 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.h
+++ b/modules/codec/ffmpeg/ffmpeg.h
@@ -104,7 +104,9 @@ void E_(ClosePostproc)( decoder_t *, void * );
     "8  ump4 \n" \
     "16 no padding\n" \
     "32 ac vlc\n" \
-    "64 Qpel chroma.")
+    "64 Qpel chroma.\n" \
+    "This must be the sum of the values. For example, to fix \"ac vlc\" and " \
+    "\"ump4\", enter 40.")
 
 #define HURRYUP_TEXT N_("Hurry up")
 #define HURRYUP_LONGTEXT N_( \
@@ -121,20 +123,24 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define DEBUG_TEXT N_( "Debug mask" )
 #define DEBUG_LONGTEXT N_( "Set ffmpeg debug mask" )
 
+/* TODO: Use a predefined list, with 0,1,2,4,7 */
 #define VISMV_TEXT N_( "Visualize motion vectors" )
-#define VISMV_LONGTEXT N_( "Set motion vectors visualization mask.\n" \
+#define VISMV_LONGTEXT N_( \
+    "You can overlay the motion vectors (arrows showing how the images move) "\
+    "on the image. This value is a mask, based on these values:\n"\
     "1 - visualize forward predicted MVs of P frames\n" \
     "2 - visualize forward predicted MVs of B frames\n" \
-    "4 - visualize backward predicted MVs of B frames" )
+    "4 - visualize backward predicted MVs of B frames\n" \
+    "To visualize all vectors, the value should be 7." )
 
 #define LOWRES_TEXT N_( "Low resolution decoding" )
-#define LOWRES_LONGTEXT N_( "Will only decode a low resolution version of " \
-    "the video." )
+#define LOWRES_LONGTEXT N_( "Only decode a low resolution version of " \
+    "the video. This requires less processing power" )
 
 #define SKIPLOOPF_TEXT N_( "Skip the loop filter for H.264 decoding" )
 #define SKIPLOOPF_LONGTEXT N_( "Skipping the loop filter (aka deblocking) " \
-    "usually has a detrimental effect on quality. However for HDTV streams " \
-    "this provides a big speedup." )
+    "usually has a detrimental effect on quality. However it provides a big " \
+    "speedup for high definition streams." )
 
 #define LIBAVCODEC_PP_TEXT N_("FFmpeg post processing filter chains")
 /* FIXME (cut/past from ffmpeg */
@@ -189,28 +195,29 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define ENC_VT_TEXT N_( "Video bitrate tolerance" )
 #define ENC_VT_LONGTEXT N_( "Video bitrate tolerance in kbit/s." )
 
-#define ENC_INTERLACE_TEXT N_( "Enable interlaced encoding" )
+#define ENC_INTERLACE_TEXT N_( "Interlaced encoding" )
 #define ENC_INTERLACE_LONGTEXT N_( "Enable dedicated " \
   "algorithms for interlaced frames." )
 
-#define ENC_INTERLACE_ME_TEXT N_( "Enable interlaced motion estimation" )
+#define ENC_INTERLACE_ME_TEXT N_( "Interlaced motion estimation" )
 #define ENC_INTERLACE_ME_LONGTEXT N_( "Enable interlaced " \
-  "motion estimation algorithms. It requires more CPU." )
+  "motion estimation algorithms. This requires more CPU." )
 
-#define ENC_PRE_ME_TEXT N_( "Enable pre-motion estimation" )
+#define ENC_PRE_ME_TEXT N_( "Pre-motion estimation" )
 #define ENC_PRE_ME_LONGTEXT N_( "Enable the pre-motion " \
   "estimation algorithm.")
 
-#define ENC_RC_STRICT_TEXT N_( "Enable strict rate control" )
+#define ENC_RC_STRICT_TEXT N_( "Strict rate control" )
 #define ENC_RC_STRICT_LONGTEXT N_( "Enable the strict rate " \
   "control algorithm." )
 
 #define ENC_RC_BUF_TEXT N_( "Rate control buffer size" )
 #define ENC_RC_BUF_LONGTEXT N_( "Rate control " \
-  "buffer size (in kbytes)." )
+  "buffer size (in kbytes). A bigger buffer will allow for better rate " \
+  "control, but will cause a delay in the stream." )
 
 #define ENC_RC_BUF_AGGR_TEXT N_( "Rate control buffer aggressiveness" )
-#define ENC_RC_BUF_AGGR_LONGTEXT N_( "Allows you to specify the rate control "\
+#define ENC_RC_BUF_AGGR_LONGTEXT N_( "Rate control "\
   "buffer aggressiveness." )
 
 #define ENC_IQUANT_FACTOR_TEXT N_( "I quantization factor" )
@@ -223,11 +230,11 @@ void E_(ClosePostproc)( decoder_t *, void * );
   "reduction algorithm to lower the encoding length and bitrate, at the " \
   "expense of lower quality frames." )
 
-#define ENC_MPEG4_MATRIX_TEXT N_( "Enable MPEG4 quantization matrix" )
-#define ENC_MPEG4_MATRIX_LONGTEXT N_( "Allows you to use the MPEG4 " \
-  "quantization matrix for mpeg2 encoding. This generally yields a " \
+#define ENC_MPEG4_MATRIX_TEXT N_( "MPEG4 quantization matrix" )
+#define ENC_MPEG4_MATRIX_LONGTEXT N_( "Use the MPEG4 " \
+  "quantization matrix for MPEG2 encoding. This generally yields a " \
   "better looking picture, while still retaining the compatibility with " \
-  "standard MPEG-2 decoders.")
+  "standard MPEG2 decoders.")
 
 #define ENC_HQ_TEXT N_( "Quality level" )
 #define ENC_HQ_LONGTEXT N_( "Quality level " \
@@ -242,18 +249,18 @@ void E_(ClosePostproc)( decoder_t *, void * );
   "threshold to ease the encoder's task." )
 
 #define ENC_QMIN_TEXT N_( "Minimum video quantizer scale" )
-#define ENC_QMIN_LONGTEXT N_( "Allows you to specify the minimum video " \
+#define ENC_QMIN_LONGTEXT N_( "Minimum video " \
   "quantizer scale." )
 
 #define ENC_QMAX_TEXT N_( "Maximum video quantizer scale" )
-#define ENC_QMAX_LONGTEXT N_( "Allows you to specify the maximum video " \
+#define ENC_QMAX_LONGTEXT N_( "Maximum video " \
   "quantizer scale." )
 
-#define ENC_TRELLIS_TEXT N_( "Enable trellis quantization" )
+#define ENC_TRELLIS_TEXT N_( "Trellis quantization" )
 #define ENC_TRELLIS_LONGTEXT N_( "Enable trellis " \
   "quantization (rate distortion for block coefficients)." )
 
-#define ENC_QSCALE_TEXT N_( "Use fixed video quantizer scale" )
+#define ENC_QSCALE_TEXT N_( "Fixed quantizer scale" )
 #define ENC_QSCALE_LONGTEXT N_( "A fixed video " \
   "quantizer scale for VBR encoding (accepted values: 0.01 to 255.0)." )
 

diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c
index f7792ebe5384780c3b4f7c11829af722915f9c30..23ffddd2c3e56852f4f63dbbb51029bac2026cfa 100644 (file)
--- a/modules/codec/subsdec.c
+++ b/modules/codec/subsdec.c
@@ -112,7 +112,7 @@ static char *ppsz_justification_text[] = {N_("Center"),N_("Left"),N_("Right")};
             "UTF-8 encoding within subtitles files.")
 #define FORMAT_TEXT N_("Formatted Subtitles")
 #define FORMAT_LONGTEXT N_("Some subtitle formats allow for text formatting. " \
-             "VLC partly implements this, but you can choose to disable all formatting.")
+ "VLC partly implements this, but you can choose to disable all formatting.")
 
 
 vlc_module_begin();

diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index d97d04c23d07dd59f77f1fceaaebeba457323f22..67d97e71b4facbbba3c845276d3fc79ca2613f30 100644 (file)
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -40,7 +40,7 @@ static int  PacketizerOpen( vlc_object_t * );
 static void DecoderClose  ( vlc_object_t * );
 
 #define DEBUG_TEXT \
-     "If nonzero, this gives additional debug information." \
+     "Enable debug"
 
 #define DEBUG_LONGTEXT \
     "This integer when viewed in binary is a debugging mask\n" \

diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 8f978e454f0d8a4f0809caedacac7d11c839884f..28cbf930462dfca2784ed20c5dc303e976fab702 100644 (file)
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -89,7 +89,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pict );
  *****************************************************************************/
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 1 (low) and 10 (high), instead " \
+  "Enfore a quality between 1 (low) and 10 (high), instead " \
   "of specifying a particular bitrate. This will produce a VBR stream." )
 
 vlc_module_begin();

diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c
index 0739af0c9bbdac65a3e5f3d8ec087ffafedc15c7..35dbcced69ffb7a7e1ee768096715d99046bdb11 100644 (file)
--- a/modules/codec/twolame.c
+++ b/modules/codec/twolame.c
@@ -49,14 +49,14 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
 
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 0.0 (high) and 50.0 (low), " \
+  "Force a specific encoding quality between 0.0 (high) and 50.0 (low), " \
   "instead of specifying a particular bitrate. " \
   "This will produce a VBR stream." )
 #define ENC_MODE_TEXT N_("Stereo mode")
-#define ENC_MODE_LONGTEXT N_( "Select how stereo streams will be handled" )
+#define ENC_MODE_LONGTEXT N_( "Handling mode for stereo streams" )
 #define ENC_VBR_TEXT N_("VBR mode")
 #define ENC_VBR_LONGTEXT N_( \
-  "By default the encoding is CBR." )
+  "Use Variable BitRate. Default is to use Constant BitRate (CBR)." )
 #define ENC_PSY_TEXT N_("Psycho-acoustic model")
 #define ENC_PSY_LONGTEXT N_( \
   "Integer from -1 (no model) to 4." )

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index c19a6b43d4aa40516831418c76b17d46acc0f1e7..a9521dd312c89e68d88c26455a4a55c2bb0da65a 100644 (file)
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -154,19 +154,17 @@ static block_t *Encode   ( encoder_t *, aout_buffer_t * );
  *****************************************************************************/
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 1 (low) and 10 (high), instead " \
+  "Enforce a quality between 1 (low) and 10 (high), instead " \
   "of specifying a particular bitrate. This will produce a VBR stream." )
 #define ENC_MAXBR_TEXT N_("Maximum encoding bitrate")
 #define ENC_MAXBR_LONGTEXT N_( \
-  "Allows you to specify a maximum bitrate in kbps. " \
-  "Useful for streaming applications." )
+  "Maximum bitrate in kbps. This is useful for streaming applications." )
 #define ENC_MINBR_TEXT N_("Minimum encoding bitrate")
 #define ENC_MINBR_LONGTEXT N_( \
-  "Allows you to specify a minimum bitrate in kbps. " \
-  "Useful for encoding for a fixed-size channel." )
+  "Minimum bitrate in kbps. This is useful for encoding for a fixed-size channel." )
 #define ENC_CBR_TEXT N_("CBR encoding")
 #define ENC_CBR_LONGTEXT N_( \
-  "Allows you to force a constant bitrate encoding (CBR)." )
+  "Force a constant bitrate encoding (CBR)." )
 
 vlc_module_begin();
     set_shortname( "Vorbis" );