Skip to content

V
vlc-2-2
Commit bf706caf authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* another 1st string review, refs #438

parent df188ac2
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
modules/mux/asf.c
View file @ bf706caf
/*****************************************************************************
* asf.c: asf muxer module for vlc
*****************************************************************************
* Copyright (C) 2003-2004 the VideoLAN team
* Copyright (C) 2003-2004, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -186,7 +186,7 @@ static int Open( vlc_object_t *p_this )
vlc_value_t val;
int i;
msg_Dbg( p_mux, "Asf muxer opened" );
msg_Dbg( p_mux, "asf muxer opened" );
sout_CfgParse( p_mux, SOUT_CFG_PREFIX, ppsz_sout_options, p_mux->p_cfg );
p_mux->pf_control = Control;
......@@ -241,8 +241,8 @@ static int Open( vlc_object_t *p_this )
var_Get( p_mux, SOUT_CFG_PREFIX "rating", &val );
p_sys->psz_rating = val.psz_string;
msg_Dbg( p_mux, "meta data: title='%s' author='%s' copyright='%s' "
"comment='%s' rating='%s'",
msg_Dbg( p_mux, "meta data: title='%s', author='%s', copyright='%s', "
"comment='%s', rating='%s'",
p_sys->psz_title, p_sys->psz_author, p_sys->psz_copyright,
p_sys->psz_comment, p_sys->psz_rating );
......@@ -334,7 +334,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
msg_Dbg( p_mux, "adding input" );
if( p_sys->i_track >= MAX_ASF_TRACKS )
{
msg_Dbg( p_mux, "cannot add this track (too much track)" );
msg_Dbg( p_mux, "cannot add this track (too much tracks)" );
return VLC_EGENERIC;
}
......
modules/mux/mp4.c
View file @ bf706caf
/*****************************************************************************
* mp4.c: mp4/mov muxer
*****************************************************************************
* Copyright (C) 2001, 2002, 2003 the VideoLAN team
* Copyright (C) 2001, 2002, 2003, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -42,10 +42,10 @@
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define FASTSTART_TEXT N_("Create \"Fast start\" files")
#define FASTSTART_TEXT N_("Create \"Fast Start\" files")
#define FASTSTART_LONGTEXT N_( \
"When this option is turned on, \"Fast start\" files will be created. " \
"(\"Fast start\" files are optimized for download, allowing the user " \
"When this option is turned on, \"Fast Start\" files will be created. " \
"(\"Fast Start\" files are optimized for downloads and allow the user " \
"to start previewing the file while it is downloading).")
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
......@@ -302,7 +302,7 @@ static void Close( vlc_object_t * p_this )
p_sys->i_mdat_pos + i_size - i_chunk );
if( sout_AccessOutRead( p_mux->p_access, p_buf ) < i_chunk )
{
msg_Warn( p_this, "read() not supported by acces output, "
msg_Warn( p_this, "read() not supported by access output, "
"won't create a fast start file" );
p_sys->b_fast_start = VLC_FALSE;
block_Release( p_buf );
......@@ -627,7 +627,7 @@ static int Mux( sout_mux_t *p_mux )
if( i_length != 0 )
{
/* TODO */
msg_Dbg( p_mux, "writing a empty subs" ) ;
msg_Dbg( p_mux, "writing an empty sub" ) ;
/* Append a idx entry */
p_stream->entry[p_stream->i_entry_count].i_pos = p_sys->i_pos;
......@@ -686,7 +686,7 @@ static void ConvertAVC1( sout_mux_t *p_mux, mp4_stream_t *tk, block_t *p_block )
/* Replace the 4 bytes start code with 4 bytes size,
* FIXME are all startcode 4 bytes ? (I don't think :( */
* FIXME are all startcodes 4 bytes ? (I don't think :( */
while( dat < end )
{
int i_size;
......
modules/mux/mpjpeg.c
View file @ bf706caf
/*****************************************************************************
* mpjpeg.c: mime multipart jpeg muxer module for vlc
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Sigmund Augdal Helberg <dnumgis@videolan.org>
......@@ -31,9 +31,9 @@
#define SEPARATOR_TEXT N_( "Multipart separator string" )
#define SEPARATOR_LONGTEXT N_( "Multipart strings like MPJPEG use a " \
"separator string between content pieces. "\
"You can select this string. Default is "\
"--myboundary" )
"specific string to separate its content " \
"pieces. You can select this string. " \
"Default is --myboundary" )
#define CONTENT_TYPE "Content-Type: image/jpeg"
......@@ -47,7 +47,7 @@ static void Close ( vlc_object_t * );
vlc_module_begin();
set_shortname( "MPJPEG" );
set_description( _("Multipart jpeg muxer") );
set_description( _("Multipart JPEG muxer") );
set_capability( "sout mux", 5 );
add_string( SOUT_CFG_PREFIX "separator", "--myboundary", NULL,
SEPARATOR_TEXT, SEPARATOR_LONGTEXT, VLC_TRUE );
......
modules/mux/ogg.c
View file @ bf706caf
/*****************************************************************************
* ogg.c: ogg muxer module for vlc
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -47,7 +47,7 @@ static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
vlc_module_begin();
set_description( _("Ogg/ogm muxer") );
set_description( _("Ogg/OGM muxer") );
set_capability( "sout mux", 10 );
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_MUX );
......@@ -517,7 +517,7 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
}
else
{
/* Wasn't already added so get rid of it */
/* wasn't already added so get rid of it */
FREE( p_stream->p_oggds_header );
FREE( p_stream );
p_sys->i_add_streams--;
......
modules/mux/wav.c
View file @ bf706caf
/*****************************************************************************
* wav.c: wav muxer module for vlc
*****************************************************************************
* Copyright (C) 2004 the VideoLAN team
* Copyright (C) 2004, 2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
......@@ -171,7 +171,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
return VLC_EGENERIC;
}
msg_Dbg( p_mux, "adding input %i channels, %iHz",
msg_Dbg( p_mux, "adding %i input channels, %iHz",
p_input->p_fmt->audio.i_channels,
p_input->p_fmt->audio.i_rate );
......
modules/packetizer/copy.c
View file @ bf706caf
/*****************************************************************************
* copy.c
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......
modules/packetizer/h264.c
View file @ bf706caf
/*****************************************************************************
* h264.c: h264/avc video packetizer
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -44,7 +44,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_PACKETIZER );
set_description( _("H264 video packetizer") );
set_description( _("H.264 video packetizer") );
set_capability( "packetizer", 50 );
set_callbacks( Open, Close );
vlc_module_end();
......@@ -203,7 +203,7 @@ static int Open( vlc_object_t *p_this )
ParseNALBlock( p_dec, p_pps );
p += 2 + i_length;
}
msg_Dbg( p_dec, "avcC length size=%d sps=%d pps=%d",
msg_Dbg( p_dec, "avcC length size=%d, sps=%d, pps=%d",
p_sys->i_avcC_length_size, i_sps, i_pps );
/* Set callback */
......
modules/packetizer/mpeg4audio.c
View file @ bf706caf
/*****************************************************************************
* mpeg4audio.c: parse and packetize an MPEG 4 audio stream
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......
modules/packetizer/mpeg4video.c
View file @ bf706caf
/*****************************************************************************
* mpeg4video.c: mpeg 4 video packetizer
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* Copyright (C) 2001, 2002, 2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -159,7 +159,7 @@ static int Open( vlc_object_t *p_this )
memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra,
p_dec->fmt_in.i_extra );
msg_Dbg( p_dec, "opening with vol size:%d", p_dec->fmt_in.i_extra );
msg_Dbg( p_dec, "opening with vol size: %d", p_dec->fmt_in.i_extra );
m4v_VOLParse( p_dec, &p_dec->fmt_out,
p_dec->fmt_out.p_extra, p_dec->fmt_out.i_extra );
}
......
modules/packetizer/mpegvideo.c
View file @ bf706caf
/*****************************************************************************
* mpegvideo.c: parse and packetize an MPEG1/2 video stream
*****************************************************************************
* Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors
* Copyright (C) 2001-2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
......@@ -49,10 +49,10 @@
#include "vlc_block_helper.h"
#define SYNC_INTRAFRAME_TEXT N_("Sync on intraframe")
#define SYNC_INTRAFRAME_TEXT N_("Sync on Intra Frame")
#define SYNC_INTRAFRAME_LONGTEXT N_("Normally the packetizer would " \
"sync on the next full frame. This flags instructs the packetizer " \
"to sync on the first intraframe found.")
"to sync on the first Intra Frame found.")
/*****************************************************************************
* Module descriptor
......@@ -189,7 +189,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_discontinuity = VLC_FALSE;
p_sys->b_sync_on_intra_frame = var_CreateGetBool( p_dec, "packetizer-mpegvideo-sync-iframe" );
if( p_sys->b_sync_on_intra_frame )
msg_Dbg( p_dec, "syncing happens on intraframe now." );
msg_Dbg( p_dec, "syncing on intra frame now" );
return VLC_SUCCESS;
}
......@@ -322,13 +322,13 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
{
if( p_pic->i_flags & BLOCK_FLAG_TYPE_I )
{
msg_Dbg( p_dec, "synced on Intra frame" );
msg_Dbg( p_dec, "synced on intra frame" );
p_sys->b_discontinuity = VLC_FALSE;
p_pic->i_flags |= BLOCK_FLAG_DISCONTINUITY;
}
else
{
msg_Dbg( p_dec, "waiting on Intra frame" );
msg_Dbg( p_dec, "waiting on intra frame" );
p_sys->i_state = STATE_NOSYNC;
block_Release( p_pic );
break;
......@@ -554,7 +554,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag )
if ( !p_sys->b_inited )
{
msg_Dbg( p_dec, "Size %dx%d fps=%.3f",
msg_Dbg( p_dec, "size %dx%d fps=%.3f",
p_dec->fmt_out.video.i_width, p_dec->fmt_out.video.i_height,
p_sys->i_frame_rate / (float)p_sys->i_frame_rate_base );
p_sys->b_inited = 1;
......
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