Commit 4190fca5 authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

codec 2nd round exept fo x264 (refs #438)

parent ec937f96
......@@ -103,7 +103,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("MPEG audio layer I/II/III parser") );
set_description( _("MPEG audio layer I/II/III decoder") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACODEC );
#if defined(__APPLE__) || defined(UNDER_CE)
......
......@@ -954,7 +954,7 @@ static int QTAudioInit( decoder_t *p_dec )
return VLC_EGENERIC;
}
msg_Dbg( p_dec, "Standard init done" );
msg_Dbg( p_dec, "standard init done" );
#endif /* else __APPLE__ */
return VLC_SUCCESS;
......
......@@ -344,7 +344,7 @@ static int ProcessInitialHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
if( p_header->speex_version_id > 1 )
{
msg_Err( p_dec, "this file was encoded with Speex bit-stream "
"version %d, which I don't know how to decode.",
"version %d which is not supported by this decoder.",
p_header->speex_version_id );
return VLC_EGENERIC;
}
......
......@@ -312,7 +312,7 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
{
if( IsUTF8( psz_subtitle ) == NULL )
{
msg_Dbg( p_dec, "Invalid UTF-8 sequence: "
msg_Dbg( p_dec, "invalid UTF-8 sequence: "
"disabling UTF-8 subtitles autodetection" );
p_sys->b_autodetect_utf8 = VLC_FALSE;
}
......@@ -336,7 +336,7 @@ static subpicture_t *ParseText( decoder_t *p_dec, block_t *p_block )
if( ( ret == (size_t)(-1) ) || inbytes_left )
{
free( psz_new_subtitle );
msg_Err( p_dec, _("Failed to convert subtitle encoding.\n"
msg_Err( p_dec, _("failed to convert subtitle encoding.\n"
"Try manually setting a character-encoding "
"before you open the file.") );
return NULL;
......
......@@ -160,7 +160,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( tarkin_synthesis_headerin( &p_sys->ti, &p_sys->tc, &oggpacket )
< 0 )
{
msg_Err( p_dec, "This bitstream does not contain Tarkin "
msg_Err( p_dec, "this bitstream does not contain Tarkin "
"video data.");
block_Release( p_block );
return NULL;
......
......@@ -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_( \
"Enfore 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." )
vlc_module_begin();
......@@ -278,7 +278,7 @@ static int ProcessHeaders( decoder_t *p_dec )
if( theora_decode_header( &p_sys->ti, &p_sys->tc, &oggpacket ) < 0 )
{
msg_Err( p_dec, "This bitstream does not contain Theora video data" );
msg_Err( p_dec, "this bitstream does not contain Theora video data" );
return VLC_EGENERIC;
}
......
......@@ -309,7 +309,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( p_sys->i_headers == 0 && p_dec->fmt_in.i_extra )
{
/* Headers already available as extra data */
msg_Dbg( p_dec, "Headers already available as extra data" );
msg_Dbg( p_dec, "headers already available as extra data" );
p_sys->i_headers = 3;
}
else if( oggpacket.bytes && p_sys->i_headers < 3 )
......@@ -664,14 +664,14 @@ static void ConfigureChannelOrder(int *pi_chan_table, int i_channels, uint32_t i
if( b_decode )
aout_CheckChannelReorder( pi_channels_in, pi_channels_out,
i_channel_mask & AOUT_CHAN_PHYSMASK,
i_channels,
pi_chan_table );
i_channel_mask & AOUT_CHAN_PHYSMASK,
i_channels,
pi_chan_table );
else
aout_CheckChannelReorder( pi_channels_out, pi_channels_in,
i_channel_mask & AOUT_CHAN_PHYSMASK,
i_channels,
pi_chan_table );
i_channel_mask & AOUT_CHAN_PHYSMASK,
i_channels,
pi_chan_table );
}
/*****************************************************************************
......
......@@ -56,22 +56,22 @@ static void Close( vlc_object_t * );
"If scenecuts appear within this interval, they are still encoded as " \
"I-frames, but do not start a new GOP." )
#define SCENE_TEXT N_("How aggressively to insert extra I-frames (-1 to 100)")
#define SCENE_TEXT N_("Extra I-Frames aggressivity" )
#define SCENE_LONGTEXT N_( "Scene-cut detection. Controls how aggressively to " \
"insert extra I-frames. With small values of scenecut, the codec often has " \
"to force an I-frame when it would exceed keyint. Good values of scenecut " \
"may find a better location for the I-frame. Large values use more I-frames " \
"than necessary, thus wasting bits. -1 disables scene-cut detection, so " \
"I-frames are be inserted only every other keyint frames, which probably " \
"leads to ugly encoding artifacts." )
"leads to ugly encoding artifacts. (1-100)." )
#define BFRAMES_TEXT N_("Number of B-frames between I and P (1 to 16)")
#define BFRAMES_LONGTEXT N_( "Number of consecutive B-frames between I and " \
"P-frames." )
#define B_ADAPT_TEXT N_("Adaptive B-frame decision")
#define B_ADAPT_LONGTEXT N_( "If this is on, the specified number of " \
"consecutive B-frames will always be used, except possibly before an I-frame. " )
#define B_ADAPT_LONGTEXT N_( "Force the specified number of " \
"consecutive B-frames to be used, except possibly before an I-frame. " )
#define B_BIAS_TEXT N_("Influences how often B-frames are used")
#define B_BIAS_LONGTEXT N_( "Bias the choice to use B-frames. Positive values " \
......@@ -93,7 +93,7 @@ static void Close( vlc_object_t * );
"live-action source material. Some decoders are unable to deal with " \
"large frameref values." )
#define NF_TEXT N_("No loop filter (enabling turns off the deblocking loop filter)")
#define NF_TEXT N_("Loop filter")
#define NF_LONGTEXT N_( "Deblocking loop filter (increases quality).")
/* Ratecontrol */
......@@ -116,16 +116,16 @@ static void Close( vlc_object_t * );
#define QPSTEP_TEXT N_("Set max QP step")
#define QPSTEP_LONGTEXT N_( "Max QP step between frames.")
#define RATETOL_TEXT N_("Allowed variance of average bitrate")
#define RATETOL_LONGTEXT N_( "Sets the allowed variance in average. " \
"bitrate.")
#define RATETOL_TEXT N_("Average bitrate tolerance")
#define RATETOL_LONGTEXT N_( "Allowed variance in average. " \
"bitrate (in kbits/s).")
#define VBV_MAXRATE_TEXT N_("Max local bitrate")
#define VBV_MAXRATE_LONGTEXT N_( "Sets a maximum local bitrate in kbits/s.")
#define VBV_BUFSIZE_TEXT N_("Size of VBV buffer")
#define VBV_BUFSIZE_LONGTEXT N_( "Sets an averaging period for the maximum " \
"local bitrate in kbits/s.")
#define VBV_BUFSIZE_TEXT N_("VBV buffer")
#define VBV_BUFSIZE_LONGTEXT N_( "Averaging period for the maximum " \
"local bitrate in kbits.")
#define VBV_INIT_TEXT N_("Initial VBV buffer occupancy")
#define VBV_INIT_LONGTEXT N_( "Sets the initial buffer occupancy as a " \
......@@ -140,8 +140,8 @@ static void Close( vlc_object_t * );
#define CHROMA_QP_OFFSET_TEXT N_("QP difference between chroma and luma")
#define CHROMA_QP_OFFSET_LONGTEXT N_( "QP difference between chroma and luma.")
#define QCOMP_TEXT N_("QP curve compression (0.0=CBR to 1.0=QCP)")
#define QCOMP_LONGTEXT N_( "QP curve compression.")
#define QCOMP_TEXT N_("QP curve compression")
#define QCOMP_LONGTEXT N_( "QP curve compression. (0.0=CBR to 1.0=QCP)")
#define CPLXBLUR_TEXT N_("Reduce fluctuations in QP (before curve compression)")
#define CPLXBLUR_LONGTEXT N_( "Temporally blur complexity.")
......@@ -215,7 +215,7 @@ static void Close( vlc_object_t * );
/* Input/Output */
#define ASM_TEXT N_("CPU optimizations")
#define ASM_LONGTEXT N_( "CPU optimizations.")
#define ASM_LONGTEXT N_( "Use assembler CPU optimizations.")
#define PSNR_TEXT N_("PSNR calculation")
#define PSNR_LONGTEXT N_( "This has no effect on actual encoding quality, "\
......@@ -539,13 +539,13 @@ static int Open ( vlc_object_t *p_this )
if( val.i_int >= 0 && val.i_int <= 51 ) i_qmin = val.i_int;
var_Get( p_enc, SOUT_CFG_PREFIX "qpmax", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) i_qmax = val.i_int;
var_Get( p_enc, SOUT_CFG_PREFIX "qp", &val );
if( val.i_int >= 0 && val.i_int <= 51 )
{
if( i_qmin > val.i_int ) i_qmin = val.i_int;
if( i_qmax < val.i_int ) i_qmax = val.i_int;
#if X264_BUILD >= 0x000a
p_sys->param.rc.i_qp_constant = val.i_int;
p_sys->param.rc.i_qp_min = i_qmin;
......@@ -570,7 +570,7 @@ static int Open ( vlc_object_t *p_this )
on average bitrate. */
if( !val.i_int )
p_sys->param.rc.i_vbv_buffer_size = p_sys->param.rc.i_bitrate * 2;
/* max bitrate = average bitrate -> CBR */
var_Get( p_enc, SOUT_CFG_PREFIX "vbv-maxrate", &val );
p_sys->param.rc.i_vbv_max_bitrate = val.i_int;
......@@ -582,7 +582,7 @@ static int Open ( vlc_object_t *p_this )
var_Get( p_enc, SOUT_CFG_PREFIX "cabac", &val );
p_sys->param.b_cabac = val.b_bool;
/* disable deblocking when nf (no loop filter) is enabled */
var_Get( p_enc, SOUT_CFG_PREFIX "nf", &val );
p_sys->param.b_deblocking_filter = !val.b_bool;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment