Changeset f5c5a773147fccc0255acabd50961e042ade393f

Timestamp:

03/31/06 00:58:23 (2 years ago)

Author:

Christophe Mutricy <xtophe@videolan.org>

git-committer:

Christophe Mutricy <xtophe@videolan.org> 1143759503 +0000

git-parent:

[ea48b014dd494d61a93768090944f392a0e78c2b]

git-author:

Christophe Mutricy <xtophe@videolan.org> 1143759503 +0000

Message:

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

Files:

• modules/codec/Modules.am (modified) (1 diff)
• modules/codec/adpcm.c (modified) (2 diffs)
• modules/codec/araw.c (modified) (1 diff)
• modules/codec/cmml/cmml.c (modified) (1 diff)
• modules/codec/dirac.c (modified) (1 diff)
• modules/codec/dvbsub.c (modified) (4 diffs)
• modules/codec/ffmpeg/ffmpeg.c (modified) (6 diffs)
• modules/codec/ffmpeg/ffmpeg.h (modified) (8 diffs)

modules/codec/Modules.am

@@ -14 +14 @@
-SOURCES_mpeg_audio = mpeg_audio.c
-SOURCES_libmpeg2 = libmpeg2.c
+SOURCES_libvc1 = libvc1.c
-SOURCES_rawvideo = rawvideo.c
-SOURCES_quicktime = quicktime.c

modules/codec/adpcm.c

@@ -148 +148 @@
-        p_dec->fmt_in.audio.i_channels > 5 )
-    {
-
+
+
-        return VLC_EGENERIC;
-    }
@@ -237 +238 @@
-    }
-
-
+ 
-             "blockalign:%d samplesperblock:%d",
-             p_dec->fmt_in.audio.i_rate, p_dec->fmt_in.audio.i_channels,

modules/codec/araw.c

@@ -205 +205 @@
-        p_dec->fmt_in.audio.i_channels > 8 )
-    {
-
+
+
-        return VLC_EGENERIC;
-    }

modules/codec/cmml/cmml.c

@@ -99 +99 @@
-
-#ifdef CMML_DEBUG
-I
+i
-#endif
-

modules/codec/dirac.c

@@ -66 +66 @@
-#define ENC_QUALITY_TEXT N_("Encoding quality")
-#define ENC_QUALITY_LONGTEXT N_( \
-Allows you to specify a quality
+Quality of the encoding
-
-vlc_module_begin();

modules/codec/dvbsub.c

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 2003 ANEVIA
-VideoLAN (Centrale Réseaux) and its contributors
+the VideoLAN team
- * $Id$
- *
@@ -53 +53 @@
-  "You can enforce the subpicture position on the video " \
-  "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
-
+ (e.g. 6=top-right)
-
-#define ENC_POSX_TEXT N_("X coordinate of the encoded subpicture")
@@ -103 +103 @@
-    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 );
-    
+
-vlc_module_end();
-
@@ -923 +923 @@
-    if( i_coding_method > 1 )
-    {
-U
+u
-        bs_skip( s, 8 * (i_segment_length - 2) - 6 );
-        return;

modules/codec/ffmpeg/ffmpeg.c

@@ -87 +87 @@
-#if defined(MODULE_NAME_is_ffmpegaltivec) \
-     || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
-ff
+FF
-    /*add_requirement( ALTIVEC );*/
-    set_capability( "decoder", 71 );
-#else
-ff
+FF
-    set_capability( "decoder", 70 );
-#endif
@@ -125 +125 @@
-    set_capability( "chroma", 50 );
-    set_callbacks( E_(OpenChroma), E_(CloseChroma) );
-ff
+FF
-
-    /* encoder submodule */
-    add_submodule();
-    set_section( N_("Encoding") , NULL );
-ff
+FF
-    set_capability( "encoder", 100 );
-    set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
@@ -188 +188 @@
-    /* demux submodule */
-    add_submodule();
-ff
+FF
-    set_capability( "demux2", 2 );
-    set_callbacks( E_(OpenDemux), E_(CloseDemux) );
@@ -196 +196 @@
-    set_capability( "video filter2", 50 );
-    set_callbacks( E_(OpenFilter), E_(CloseFilter) );
-ff
+FF
-
-    /* crop/padd submodule */
@@ -202 +202 @@
-    set_capability( "crop padd", 10 );
-    set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
-ff
+FF
-
-    /* video filter submodule */
@@ -208 +208 @@
-    set_capability( "video filter2", 0 );
-    set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
-ff
+FF
-    add_shortcut( "ffmpeg-deinterlace" );
-

modules/codec/ffmpeg/ffmpeg.h

@@ -86 +86 @@
- *****************************************************************************/
-#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_( \
-f
+F
-    "However, with a buggy encoder (such as the ISO MPEG-4 encoder from M$) " \
-    "this can produce a lot of errors.\n" \
@@ -96 +98 @@
-#define BUGS_TEXT N_("Workaround bugs")
-#define BUGS_LONGTEXT N_( \
-
+:
-    "1  autodetect\n" \
-    "2  old msmpeg4\n" \
@@ -103 +105 @@
-    "16 no padding\n" \
-    "32 ac vlc\n" \
-
+.
-
-#define HURRYUP_TEXT N_("Hurry up")
-#define HURRYUP_LONGTEXT N_( \
-Allow the decoder to
+The decoder can
-    "when there is not enough time. It's useful with low CPU power " \
-    "but it can produce distorted pictures.")
@@ -135 +137 @@
-    "this provides a big speedup." )
-
-ff
+FF
-/* FIXME (cut/past from ffmpeg */
-#define LIBAVCODEC_PP_LONGTEXT \
@@ -178 +180 @@
-
-#define ENC_KEYINT_TEXT N_( "Ratio of key frames" )
-Allows you to specify the n
+N
-  "that will be coded for one key frame." )
-
-#define ENC_BFRAMES_TEXT N_( "Ratio of B frames" )
-Allows you to specify the n
+N
-  "B frames that will be coded between two reference frames." )
-
-#define ENC_VT_TEXT N_( "Video bitrate tolerance" )
-
-
+
-
-#define ENC_INTERLACE_TEXT N_( "Enable interlaced encoding" )
-Allows you to e
+E
-  "algorithms for interlaced frames." )
-
-#define ENC_INTERLACE_ME_TEXT N_( "Enable interlaced motion estimation" )
-Allows you to e
+E
-  "motion estimation algorithms. It requires more CPU." )
-
- 
-Allows you to enable the pre 
-." 
+-
+Enable the pre-
+ algorithm."
-
-#define ENC_RC_STRICT_TEXT N_( "Enable strict rate control" )
-Allows you to e
+E
-  "control algorithm." )
-
-#define ENC_RC_BUF_TEXT N_( "Rate control buffer size" )
-Allows you to specify the r
-
+R
+ (in kbytes)
-
-#define ENC_RC_BUF_AGGR_TEXT N_( "Rate control buffer aggressiveness" )
@@ -214 +215 @@
-
-#define ENC_IQUANT_FACTOR_TEXT N_( "I quantization factor" )
-"Allows you to specify the "
-q
+
+Q
-  "1.0 => same qscale for I and P frames)." )
-
-#define ENC_NOISE_RED_TEXT N_( "Noise reduction" )
-Allows you to e
+E
-  "reduction algorithm to lower the encoding length and bitrate, at the " \
-  "expense of lower quality frames." )
@@ -230 +231 @@
-
-#define ENC_HQ_TEXT N_( "Quality level" )
-Allows you to specify the q
+Q
-  "for the encoding of motions vectors (this can slow down the encoding " \
-  "very much)." )
-
-#define ENC_HURRYUP_TEXT N_( "Hurry up" )
-Allows you to specify if t
-should
+T
+can
-  "the encoding rate. It will disable trellis quantization, then the rate " \
-  "distortion of motion vectors (hq), and raise the noise reduction " \
@@ -250 +251 @@
-
-#define ENC_TRELLIS_TEXT N_( "Enable trellis quantization" )
-Allows you to e
+E
-  "quantization (rate distortion for block coefficients)." )
-
-#define ENC_QSCALE_TEXT N_( "Use fixed video quantizer scale" )
-llows you to specify a
+
-  "quantizer scale for VBR encoding (accepted values: 0.01 to 255.0)." )
-
-#define ENC_STRICT_TEXT N_( "Strict standard compliance" )
-Allows you to f
+F
-  "compliance when encoding (accepted values: -1, 0, 1)." )
-
-#define ENC_LUMI_MASKING_TEXT N_( "Luminance masking" )
-Allows you to r
+R
-  "very bright macroblocks (default: 0.0)." )
-
-#define ENC_DARK_MASKING_TEXT N_( "Darkness masking" )
-Allows you to r
+R
-  "very dark macroblocks (default: 0.0)." )
-
-#define ENC_P_MASKING_TEXT N_( "Motion masking" )
-Allows you to r
+R
-  "macroblocks with a high temporal complexity (default: 0.0)." )
-
-#define ENC_BORDER_MASKING_TEXT N_( "Border masking" )
-Allows you to r
+R
-  "for macroblocks at the border of the frame (default: 0.0)." )
-