String review in codec. 1st part. ffmpeg.h to be improve. refs #438

modules/codec/Modules.am

@@ -13,6 +13,7 @@ SOURCES_speex = speex.c
 SOURCES_adpcm = adpcm.c
 SOURCES_mpeg_audio = mpeg_audio.c
 SOURCES_libmpeg2 = libmpeg2.c
+SOURCES_libvc1 = libvc1.c
 SOURCES_rawvideo = rawvideo.c
 SOURCES_quicktime = quicktime.c
 SOURCES_subsdec = subsdec.c

modules/codec/adpcm.c

@@ -147,7 +147,8 @@ static int OpenDecoder( vlc_object_t *p_this )
     if( p_dec->fmt_in.audio.i_channels <= 0 ||
         p_dec->fmt_in.audio.i_channels > 5 )
     {
-        msg_Err( p_dec, "bad channels count(1-5)" );
+        msg_Err( p_dec, "invalid number of channel (not between 1 and 5): %i", 
+                 p_dec->fmt_in.audio.i_channels );
         return VLC_EGENERIC;
     }
 
@@ -236,7 +237,7 @@ static int OpenDecoder( vlc_object_t *p_this )
             p_dec->fmt_in.audio.i_channels;
     }
 
-    msg_Dbg( p_dec, "format: samplerate:%dHz channels:%d bits/sample:%d "
+    msg_Dbg( p_dec, "format: samplerate:%d Hz channels:%d bits/sample:%d "
              "blockalign:%d samplesperblock:%d",
              p_dec->fmt_in.audio.i_rate, p_dec->fmt_in.audio.i_channels,
              p_dec->fmt_in.audio.i_bitspersample, p_sys->i_block,

modules/codec/araw.c

@@ -204,7 +204,8 @@ static int DecoderOpen( vlc_object_t *p_this )
     if( p_dec->fmt_in.audio.i_channels <= 0 ||
         p_dec->fmt_in.audio.i_channels > 8 )
     {
-        msg_Err( p_dec, "bad channels count (1-8)" );
+        msg_Err( p_dec, "bad channels count (1-8): %i",
+                 p_dec->fmt_in.audio.i_channels );
         return VLC_EGENERIC;
     }
 

modules/codec/cmml/cmml.c

@@ -98,7 +98,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_dec->pf_decode_sub = DecodeBlock;
 
 #ifdef CMML_DEBUG
-    msg_Dbg( p_dec, "I am at %p", p_dec );
+    msg_Dbg( p_dec, "i am at %p", p_dec );
 #endif
 
     /* Allocate the memory needed to store the decoder's structure */

modules/codec/dirac.c

@@ -65,7 +65,7 @@ static const char *ppsz_enc_options[] = {
  *****************************************************************************/
 #define ENC_QUALITY_TEXT N_("Encoding quality")
 #define ENC_QUALITY_LONGTEXT N_( \
-  "Allows you to specify a quality between 1.0 (low) and 10.0 (high)." )
+  "Quality of the encoding between 1.0 (low) and 10.0 (high)." )
 
 vlc_module_begin();
     set_category( CAT_INPUT );

modules/codec/dvbsub.c

@@ -3,7 +3,7 @@
  *            DVB subtitles encoder (developed for Anevia, www.anevia.com)
  *****************************************************************************
  * Copyright (C) 2003 ANEVIA
- * Copyright (C) 2003-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2003-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
@@ -52,7 +52,7 @@
 #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).")
+  "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." )
@@ -102,7 +102,7 @@ vlc_module_begin();
 
     add_integer( ENC_CFG_PREFIX "x", -1, NULL, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, VLC_FALSE );
     add_integer( ENC_CFG_PREFIX "y", -1, NULL, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, VLC_FALSE );
-    add_integer( ENC_CFG_PREFIX "timeout", 15, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, VLC_FALSE );    
+    add_integer( ENC_CFG_PREFIX "timeout", 15, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, VLC_FALSE );
 vlc_module_end();
 
 static const char *ppsz_enc_options[] = { NULL };
@@ -922,7 +922,7 @@ static void decode_object( decoder_t *p_dec, bs_t *s )
 
     if( i_coding_method > 1 )
     {
-        msg_Dbg( p_dec, "Unknown DVB subtitling coding %d is not handled!", i_coding_method );
+        msg_Dbg( p_dec, "unknown DVB subtitling coding %d is not handled!", i_coding_method );
         bs_skip( s, 8 * (i_segment_length - 2) - 6 );
         return;
     }

modules/codec/ffmpeg/ffmpeg.c

@@ -86,11 +86,11 @@ vlc_module_begin();
     /* decoder main module */
 #if defined(MODULE_NAME_is_ffmpegaltivec) \
      || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
-    set_description( _("AltiVec ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+    set_description( _("AltiVec FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
     /*add_requirement( ALTIVEC );*/
     set_capability( "decoder", 71 );
 #else
-    set_description( _("ffmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+    set_description( _("FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
     set_capability( "decoder", 70 );
 #endif
     set_section( N_("Decoding") , NULL );
@@ -124,12 +124,12 @@ vlc_module_begin();
     add_submodule();
     set_capability( "chroma", 50 );
     set_callbacks( E_(OpenChroma), E_(CloseChroma) );
-    set_description( _("ffmpeg chroma conversion") );
+    set_description( _("FFmpeg chroma conversion") );
 
     /* encoder submodule */
     add_submodule();
     set_section( N_("Encoding") , NULL );
-    set_description( _("ffmpeg audio/video encoder") );
+    set_description( _("FFmpeg audio/video encoder") );
     set_capability( "encoder", 100 );
     set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
 
@@ -187,7 +187,7 @@ vlc_module_begin();
 
     /* demux submodule */
     add_submodule();
-    set_description( _("ffmpeg demuxer" ) );
+    set_description( _("FFmpeg demuxer" ) );
     set_capability( "demux2", 2 );
     set_callbacks( E_(OpenDemux), E_(CloseDemux) );
 
@@ -195,19 +195,19 @@ vlc_module_begin();
     add_submodule();
     set_capability( "video filter2", 50 );
     set_callbacks( E_(OpenFilter), E_(CloseFilter) );
-    set_description( _("ffmpeg video filter") );
+    set_description( _("FFmpeg video filter") );
 
     /* crop/padd submodule */
     add_submodule();
     set_capability( "crop padd", 10 );
     set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
-    set_description( _("ffmpeg crop padd filter") );
+    set_description( _("FFmpeg crop padd filter") );
 
     /* video filter submodule */
     add_submodule();
     set_capability( "video filter2", 0 );
     set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
-    set_description( _("ffmpeg deinterlace video filter") );
+    set_description( _("FFmpeg deinterlace video filter") );
     add_shortcut( "ffmpeg-deinterlace" );
 
     var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );

modules/codec/ffmpeg/ffmpeg.h

@@ -85,28 +85,30 @@ void E_(ClosePostproc)( decoder_t *, void * );
  * Module descriptor help strings
  *****************************************************************************/
 #define DR_TEXT N_("Direct rendering")
+/* FIXME Does somebody who knows what it does, explain */
+#define DR_LONGTEXT N_("Direct rendering")
 
 #define ERROR_TEXT N_("Error resilience")
 #define ERROR_LONGTEXT N_( \
-    "ffmpeg can do error resilience.\n" \
+    "Ffmpeg can do error resilience.\n" \
     "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) " \
     "this can produce a lot of errors.\n" \
     "Valid values range from 0 to 4 (0 disables all errors resilience).")
 
 #define BUGS_TEXT N_("Workaround bugs")
 #define BUGS_LONGTEXT N_( \
-    "Try to fix some bugs\n" \
+    "Try to fix some bugs:\n" \
     "1  autodetect\n" \
     "2  old msmpeg4\n" \
     "4  xvid interlaced\n" \
     "8  ump4 \n" \
     "16 no padding\n" \
     "32 ac vlc\n" \
-    "64 Qpel chroma")
+    "64 Qpel chroma.")
 
 #define HURRYUP_TEXT N_("Hurry up")
 #define HURRYUP_LONGTEXT N_( \
-    "Allow the decoder to partially decode or skip frame(s) " \
+    "The decoder can partially decode or skip frame(s) " \
     "when there is not enough time. It's useful with low CPU power " \
     "but it can produce distorted pictures.")
 
@@ -134,7 +136,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
     "usually has a detrimental effect on quality. However for HDTV streams " \
     "this provides a big speedup." )
 
-#define LIBAVCODEC_PP_TEXT N_("ffmpeg post processing filter chains")
+#define LIBAVCODEC_PP_TEXT N_("FFmpeg post processing filter chains")
 /* FIXME (cut/past from ffmpeg */
 #define LIBAVCODEC_PP_LONGTEXT \
 "<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...\n" \
@@ -177,48 +179,47 @@ void E_(ClosePostproc)( decoder_t *, void * );
 #define ENC_CFG_PREFIX "sout-ffmpeg-"
 
 #define ENC_KEYINT_TEXT N_( "Ratio of key frames" )
-#define ENC_KEYINT_LONGTEXT N_( "Allows you to specify the number of frames " \
+#define ENC_KEYINT_LONGTEXT N_( "Number of frames " \
   "that will be coded for one key frame." )
 
 #define ENC_BFRAMES_TEXT N_( "Ratio of B frames" )
-#define ENC_BFRAMES_LONGTEXT N_( "Allows you to specify the number of " \
+#define ENC_BFRAMES_LONGTEXT N_( "Number of " \
   "B frames that will be coded between two reference frames." )
 
 #define ENC_VT_TEXT N_( "Video bitrate tolerance" )
-#define ENC_VT_LONGTEXT N_( "Allows you to specify the video bitrate " \
-  "tolerance in kbit/s." )
+#define ENC_VT_LONGTEXT N_( "Video bitrate tolerance in kbit/s." )
 
 #define ENC_INTERLACE_TEXT N_( "Enable interlaced encoding" )
-#define ENC_INTERLACE_LONGTEXT N_( "Allows you to enable dedicated " \
+#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_LONGTEXT N_( "Allows you to enable interlaced " \
+#define ENC_INTERLACE_ME_LONGTEXT N_( "Enable interlaced " \
   "motion estimation algorithms. It requires more CPU." )
 
-#define ENC_PRE_ME_TEXT N_( "Enable pre motion estimation" )
-#define ENC_PRE_ME_LONGTEXT N_( "Allows you to enable the pre motion " \
-  "estimation." )
+#define ENC_PRE_ME_TEXT N_( "Enable 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_LONGTEXT N_( "Allows you to enable the strict rate " \
+#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_( "Allows you to specify the rate control " \
-  "buffer size." )
+#define ENC_RC_BUF_LONGTEXT N_( "Rate control " \
+  "buffer size (in kbytes)." )
 
 #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 "\
   "buffer aggressiveness." )
 
 #define ENC_IQUANT_FACTOR_TEXT N_( "I quantization factor" )
-#define ENC_IQUANT_FACTOR_LONGTEXT N_( "Allows you to specify the " \
-  "quantization factor of I frames, compared with P frames (for instance " \
+#define ENC_IQUANT_FACTOR_LONGTEXT N_(  \
+  "Quantization factor of I frames, compared with P frames (for instance " \
   "1.0 => same qscale for I and P frames)." )
 
 #define ENC_NOISE_RED_TEXT N_( "Noise reduction" )
-#define ENC_NOISE_RED_LONGTEXT N_( "Allows you to enable a simple noise " \
+#define ENC_NOISE_RED_LONGTEXT N_( "Enable a simple noise " \
   "reduction algorithm to lower the encoding length and bitrate, at the " \
   "expense of lower quality frames." )
 
@@ -229,13 +230,13 @@ void E_(ClosePostproc)( decoder_t *, void * );
   "standard MPEG-2 decoders.")
 
 #define ENC_HQ_TEXT N_( "Quality level" )
-#define ENC_HQ_LONGTEXT N_( "Allows you to specify the quality level " \
+#define ENC_HQ_LONGTEXT N_( "Quality level " \
   "for the encoding of motions vectors (this can slow down the encoding " \
   "very much)." )
 
 #define ENC_HURRYUP_TEXT N_( "Hurry up" )
-#define ENC_HURRYUP_LONGTEXT N_( "Allows you to specify if the encoder " \
-  "should make on-the-fly quality tradeoffs if your CPU can't keep up with " \
+#define ENC_HURRYUP_LONGTEXT N_( "The encoder " \
+  "can make on-the-fly quality tradeoffs if your CPU can't keep up with " \
   "the encoding rate. It will disable trellis quantization, then the rate " \
   "distortion of motion vectors (hq), and raise the noise reduction " \
   "threshold to ease the encoder's task." )
@@ -249,31 +250,31 @@ void E_(ClosePostproc)( decoder_t *, void * );
   "quantizer scale." )
 
 #define ENC_TRELLIS_TEXT N_( "Enable trellis quantization" )
-#define ENC_TRELLIS_LONGTEXT N_( "Allows you to enable trellis " \
+#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_LONGTEXT N_( "Allows you to specify a fixed video " \
+#define ENC_QSCALE_LONGTEXT N_( "A fixed video " \
   "quantizer scale for VBR encoding (accepted values: 0.01 to 255.0)." )
 
 #define ENC_STRICT_TEXT N_( "Strict standard compliance" )
-#define ENC_STRICT_LONGTEXT N_( "Allows you to force a strict standard " \
+#define ENC_STRICT_LONGTEXT N_( "Force a strict standard " \
   "compliance when encoding (accepted values: -1, 0, 1)." )
 
 #define ENC_LUMI_MASKING_TEXT N_( "Luminance masking" )
-#define ENC_LUMI_MASKING_LONGTEXT N_( "Allows you to raise the quantizer for " \
+#define ENC_LUMI_MASKING_LONGTEXT N_( "Raise the quantizer for " \
   "very bright macroblocks (default: 0.0)." )
 
 #define ENC_DARK_MASKING_TEXT N_( "Darkness masking" )
-#define ENC_DARK_MASKING_LONGTEXT N_( "Allows you to raise the quantizer for " \
+#define ENC_DARK_MASKING_LONGTEXT N_( "Raise the quantizer for " \
   "very dark macroblocks (default: 0.0)." )
 
 #define ENC_P_MASKING_TEXT N_( "Motion masking" )
-#define ENC_P_MASKING_LONGTEXT N_( "Allows you to raise the quantizer for " \
+#define ENC_P_MASKING_LONGTEXT N_( "Raise the quantizer for " \
   "macroblocks with a high temporal complexity (default: 0.0)." )
 
 #define ENC_BORDER_MASKING_TEXT N_( "Border masking" )
-#define ENC_BORDER_MASKING_LONGTEXT N_( "Allows you to raise the quantizer " \
+#define ENC_BORDER_MASKING_LONGTEXT N_( "Raise the quantizer " \
   "for macroblocks at the border of the frame (default: 0.0)." )
 
 #define ENC_LUMA_ELIM_TEXT N_( "Luminance elimination" )