/*****************************************************************************
* a52.c : Raw A/52 Stream input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: a52sys.c,v 1.11 2003/12/22 02:24:52 sam Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: a52sys.c,v 1.12 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/*****************************************************************************
* aac.c : Raw aac Stream input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: aac.c,v 1.8 2003/11/21 00:38:01 gbazin Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: aac.c,v 1.9 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/*****************************************************************************
- * asf.c : ASFv01 file input module for vlc
+ * asf.c : ASF demux module
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: asf.c,v 1.48 2004/01/05 13:00:20 zorglub Exp $
+ * $Id: asf.c,v 1.49 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
}
/* We add all info about this stream */
- p_cat = input_InfoCategory( p_input, "Asf" );
+ p_cat = input_InfoCategory( p_input, _("Asf") );
playlist_t *p_playlist = (playlist_t *)vlc_object_find( p_input,
VLC_OBJECT_PLAYLIST, FIND_PARENT);
if( p_sys->i_length > 0 )
demux_sys_t *p_sys = p_input->p_demux_data;
int i_stream;
- msg_Dbg( p_input, "Freeing all memory" );
+ msg_Dbg( p_input, "freeing all memory" );
ASF_FreeObjectRoot( p_input->s, p_sys->p_root );
for( i_stream = 0; i_stream < 128; i_stream++ )
/*****************************************************************************
* libasf.c :
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libasf.c,v 1.18 2003/09/07 22:48:29 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: libasf.c,v 1.19 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
p_common->p_next = NULL;
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Found Object guid: " GUID_FMT " size:"I64Fd,
+ "found object guid: " GUID_FMT " size:"I64Fd,
GUID_PRINT( p_common->i_object_id ),
p_common->i_object_size );
#endif
p_hdr->p_last = NULL;
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Header Object\" subobj:%d, reserved1:%d, reserved2:%d",
+ "read \"header object\" subobj:%d, reserved1:%d, reserved2:%d",
p_hdr->i_sub_object_count,
p_hdr->i_reserved1,
p_hdr->i_reserved2 );
p_data->i_reserved = GetWLE( p_peek + 48 );
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Data Object\" file_id:" GUID_FMT " total data packet:"
+ "read \"data object\" file_id:" GUID_FMT " total data packet:"
I64Fd" reserved:%d",
GUID_PRINT( p_data->i_file_id ),
p_data->i_total_data_packets,
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Index Object\" file_id:" GUID_FMT
+ "read \"index object\" file_id:" GUID_FMT
" index_entry_time_interval:"I64Fd" max_packet_count:%d "
"index_entry_count:%ld",
GUID_PRINT( p_index->i_file_id ),
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"File Properties Object\" file_id:" GUID_FMT
+ "read \"file properties object\" file_id:" GUID_FMT
" file_size:"I64Fd" creation_date:"I64Fd" data_packets_count:"
I64Fd" play_duration:"I64Fd" send_duration:"I64Fd" preroll:"
I64Fd" flags:%d min_data_packet_size:%d max_data_packet_size:%d "
}
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Header Extention Object\" reserved1:" GUID_FMT " reserved2:%d header_extention_size:%d",
+ "read \"header extention object\" reserved1:" GUID_FMT " reserved2:%d header_extention_size:%d",
GUID_PRINT( p_he->i_reserved1 ),
p_he->i_reserved2,
p_he->i_header_extention_size );
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Stream Properties Object\" stream_type:" GUID_FMT
+ "read \"stream Properties object\" stream_type:" GUID_FMT
" error_correction_type:" GUID_FMT " time_offset:"I64Fd
" type_specific_data_length:%d error_correction_data_length:%d"
" flags:0x%x stream_number:%d",
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Codec List Object\" reserved_guid:" GUID_FMT " codec_entries_count:%d",
+ "read \"codec list object\" reserved_guid:" GUID_FMT " codec_entries_count:%d",
GUID_PRINT( p_cl->i_reserved ),
p_cl->i_codec_entries_count );
{
#define codec p_cl->codec[i_codec]
msg_Dbg( (vlc_object_t*)s,
- "Read \"Codec List Object\" codec[%d] %s name:\"%s\" description:\"%s\" information_length:%d",
+ "read \"codec list object\" codec[%d] %s name:\"%s\" description:\"%s\" information_length:%d",
i_codec,
( codec.i_type == ASF_CODEC_TYPE_VIDEO ) ? "video" : ( ( codec.i_type == ASF_CODEC_TYPE_AUDIO ) ? "audio" : "unknown" ),
codec.psz_name,
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Read \"Content Description Object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
+ "Read \"content description object\" title:\"%s\" author:\"%s\" copyright:\"%s\" description:\"%s\" rating:\"%s\"",
p_cd->psz_title,
p_cd->psz_author,
p_cd->psz_copyright,
}
if( ASF_ReadObjectCommon( s, p_obj ) )
{
- msg_Warn( (vlc_object_t*)s, "Cannot read one asf object" );
+ msg_Warn( (vlc_object_t*)s, "cannot read one asf object" );
return VLC_EGENERIC;
}
p_obj->common.p_father = p_father;
if( p_obj->common.i_object_size < 24 )
{
- msg_Warn( (vlc_object_t*)s, "Found a corrupted asf object (size<24)" );
+ msg_Warn( (vlc_object_t*)s, "found a corrupted asf object (size<24)" );
return VLC_EGENERIC;
}
/* find this object */
/* Now load this object */
if( ASF_Object_Function[i_index].ASF_ReadObject_function == NULL )
{
- msg_Warn( (vlc_object_t*)s, "Unknown asf object (not loaded)" );
+ msg_Warn( (vlc_object_t*)s, "unknown asf object (not loaded)" );
i_result = VLC_SUCCESS;
}
else
if( ASF_Object_Function[i_index].ASF_FreeObject_function == NULL )
{
msg_Warn( (vlc_object_t*)s,
- "Unknown asf object " GUID_FMT,
+ "unknown asf object " GUID_FMT,
GUID_PRINT( p_obj->common.i_object_id ) );
}
else
{
#ifdef ASF_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Free asf object " GUID_FMT,
+ "free asf object " GUID_FMT,
GUID_PRINT( p_obj->common.i_object_id ) );
#endif
(ASF_Object_Function[i_index].ASF_FreeObject_function)( p_obj );
p_root->p_index = (asf_object_index_t*)p_obj;
break;
default:
- msg_Warn( (vlc_object_t*)s, "Unknow Object found" );
+ msg_Warn( (vlc_object_t*)s, "unknow object found" );
break;
}
if( p_obj->common.i_type == ASF_OBJECT_TYPE_DATA &&
{
return p_root;
}
- msg_Warn( (vlc_object_t*)s, "cannot fine file properties object" );
+ msg_Warn( (vlc_object_t*)s, "cannot find file properties object" );
}
/* Invalid file */
/*****************************************************************************
* libasf.h :
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libasf.h,v 1.7 2003/08/18 19:18:47 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: libasf.h,v 1.8 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* au.c : au file input module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: au.c,v 1.11 2003/11/21 00:38:01 gbazin Exp $
+ * $Id: au.c,v 1.12 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
i_pos += p_sys->fmt.audio.i_blockalign - i_pos % p_sys->fmt.audio.i_blockalign;
if( stream_Seek( p_input->s, i_pos ) )
{
- msg_Err( p_input, "Seek failed(cannot resync)" );
+ msg_Err( p_input, "seek failed (cannot resync)" );
}
}
}
/*****************************************************************************
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: avi.c,v 1.84 2004/01/05 13:00:20 zorglub Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: avi.c,v 1.85 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+
+#define INTERLEAVE_TEXT N_("Force interleaved method" )
+#define INTERLEAVE_LONGTEXT N_( "Force interleaved method" )
+
+#define INDEX_TEXT N_("Force index creation")
+#define INDEX_LONGTEXT N_( \
+ "Recreate a index for the AVI file so we can seek trough it more reliably." )
+
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
vlc_module_begin();
- add_category_hint( N_("AVI demuxer"), NULL, VLC_TRUE );
- add_bool( "avi-interleaved", 0, NULL,
- N_("force interleaved method"),
- N_("force interleaved method"), VLC_TRUE );
- add_bool( "avi-index", 0, NULL,
- N_("force index creation"),
- N_("force index creation"), VLC_TRUE );
-
- set_description( N_("AVI demuxer") );
+ set_description( _("AVI demuxer") );
set_capability( "demux", 212 );
+
+ add_bool( "avi-interleaved", 0, NULL,
+ INTERLEAVE_TEXT, INTERLEAVE_LONGTEXT, VLC_TRUE );
+ add_bool( "avi-index", 0, NULL,
+ INDEX_TEXT, INDEX_LONGTEXT, VLC_TRUE );
+
set_callbacks( Open, Close );
vlc_module_end();
if( p_sys->i_track <= 0 )
{
- msg_Err( p_input, "No valid track" );
+ msg_Err( p_input, "no valid track" );
goto error;
}
/* p_sys->i_time = __MAX( AVI_GetPTS( p_stream ), p_sys->i_time );*/
}
}
- msg_Dbg( p_input, "seek: "I64Fd" secondes", p_sys->i_time /1000000 );
+ msg_Dbg( p_input, "seek: "I64Fd" seconds", p_sys->i_time /1000000 );
/* set true movie time */
#endif
if( !p_sys->i_time )
/*****************************************************************************
* avi.h : AVI file Stream input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: avi.h,v 1.18 2004/01/04 17:35:02 fenrir Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: avi.h,v 1.19 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
/*****************************************************************************
- * libavi.c :
+ * libavi.c : LibAVI
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: libavi.c,v 1.29 2003/10/24 12:22:51 fenrir Exp $
+ * $Id: libavi.c,v 1.30 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
#ifdef AVI_DEBUG
msg_Dbg( (vlc_object_t*)s,
- "Found Chunk fourcc:%8.8x (%4.4s) size:"I64Fd" pos:"I64Fd,
+ "found Chunk fourcc:%8.8x (%4.4s) size:"I64Fd" pos:"I64Fd,
p_chk->common.i_chunk_fourcc,
(char*)&p_chk->common.i_chunk_fourcc,
p_chk->common.i_chunk_size,
if( p_container->common.i_chunk_fourcc == AVIFOURCC_LIST &&
p_container->list.i_type == AVIFOURCC_movi )
{
- msg_Dbg( (vlc_object_t*)s, "Skipping movi chunk" );
+ msg_Dbg( (vlc_object_t*)s, "skipping movi chunk" );
if( b_seekable )
{
return AVI_NextChunk( s, p_container );
{ AVIFOURCC_ICRP, "cropped" },
{ AVIFOURCC_IDIM, "dimensions" },
{ AVIFOURCC_IDPI, "dots per inch" },
- { AVIFOURCC_IENG, "enginner" },
+ { AVIFOURCC_IENG, "engineer" },
{ AVIFOURCC_IGNR, "genre" },
{ AVIFOURCC_IKEY, "keywords" },
{ AVIFOURCC_ILGT, "lightness" },
/*****************************************************************************
* libavi.h : LibAVI library
******************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libavi.h,v 1.13 2003/11/30 22:14:39 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: libavi.h,v 1.14 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
+
/* flags for use in <dwFlags> in AVIFileHdr */
#define AVIF_HASINDEX 0x00000010 /* Index at end of file? */
#define AVIF_MUSTUSEINDEX 0x00000020
* demux2 adaptation layer.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: demux2.c,v 1.6 2004/01/20 14:51:30 fenrir Exp $
+ * $Id: demux2.c,v 1.7 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static void Demux2Close ( vlc_object_t * );
vlc_module_begin();
- set_description( _("demux2 adaptation layer" ) );
+ set_description( _("Demux2 adaptation layer" ) );
set_capability( "demux", 2 );
set_callbacks( Demux2Open, Demux2Close );
add_shortcut( "demux2" );
/*****************************************************************************
* demuxdump.c : Pseudo demux module for vlc (dump raw stream)
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: demuxdump.c,v 1.11 2003/11/05 17:57:29 gbazin Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: demuxdump.c,v 1.12 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*****************************************************************************/
static int Activate ( vlc_object_t * );
static int Demux ( input_thread_t * );
-static void Desactivate ( vlc_object_t * );
+static void Deactivate ( vlc_object_t * );
#define DUMP_BLOCKSIZE 16384
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define FILE_TEXT N_("Dump file name")
+#define FILE_TEXT N_("Filename of dump")
#define FILE_LONGTEXT N_( \
"Specify a file name to which the raw stream will be dumped." )
vlc_module_begin();
- set_description( _("file dump demuxer") );
+ set_description( _("Filedump demuxer") );
set_capability( "demux", 0 );
- add_category_hint( "File", NULL, VLC_FALSE );
- add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
- FILE_LONGTEXT, VLC_FALSE );
- set_callbacks( Activate, Desactivate );
+ add_file( "demuxdump-file", "stream-demux.dump", NULL, FILE_TEXT,
+ FILE_LONGTEXT, VLC_FALSE );
+ set_callbacks( Activate, Deactivate );
add_shortcut( "dump" );
vlc_module_end();
}
/*****************************************************************************
- * Desctivate: initializes dump structures
+ * Deactivate: initializes dump structures
*****************************************************************************/
-static void Desactivate ( vlc_object_t *p_this )
+static void Deactivate ( vlc_object_t *p_this )
{
input_thread_t *p_input = (input_thread_t *)p_this;
demux_sys_t *p_demux = (demux_sys_t*)p_input->p_demux_data;
* demuxstream.c: Read an MPEG stream from the satellite and stream it
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: demuxstream.c,v 1.1 2003/11/06 16:06:28 massiot Exp $
+ * $Id: demuxstream.c,v 1.2 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
set_capability( "demux", 0 );
add_shortcut( "demuxstream" );
#endif
- add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
add_bool( "vls-backwards-compat", 0, NULL,
VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT, VLC_TRUE );
add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT, VLC_TRUE );
( p_new_pat->i_version != p_stream_data->i_pat_version ) ) ||
p_stream_data->i_pat_version == PAT_UNINITIALIZED )
{
- msg_Dbg( p_input, "Processing PAT version %d", p_new_pat->i_version );
+ msg_Dbg( p_input, "processing PAT version %d", p_new_pat->i_version );
/* Delete all programs */
while( p_input->stream.i_pgrm_number )
while( p_pgrm )
{
- msg_Dbg( p_input, "New program: %d", p_pgrm->i_number );
+ msg_Dbg( p_input, "new program: %d", p_pgrm->i_number );
/* If program = 0, we're having info about NIT not PMT */
if( p_pgrm->i_number )
dvbpsi_descriptor_t *p_dr = p_new_pmt->p_first_descriptor;
int i_loop;
- msg_Dbg( p_input, "Processing PMT for program %d version %d",
+ msg_Dbg( p_input, "processing PMT for program %d version %d",
p_new_pmt->i_program_number, p_new_pmt->i_version );
/* Delete all ES in this program except the PSI. We start from the
if( i_fourcc == VLC_FOURCC(0,0,0,0) )
{
msg_Warn( p_input,
- "Unknown codec/type for Private PES stream" );
+ "unknown codec/type for Private PES stream" );
}
}
* dvdnav.c: DVD module using the dvdnav library.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: dvdnav.c,v 1.7 2004/01/19 21:30:43 fenrir Exp $
+ * $Id: dvdnav.c,v 1.8 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static void DemuxClose( vlc_object_t * );
vlc_module_begin();
- set_description( "DVDnav Input" );
- add_category_hint( N_("DVD"), NULL , VLC_TRUE );
- add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ set_description( _("DVDnav Input") );
+ add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_capability( "access", 0 );
add_shortcut( "dvdnav" );
set_callbacks( AccessOpen, AccessClose );
add_submodule();
- set_description( "DVDnav Input (demux)" );
+ set_description( _("DVDnav Input (demux)") );
set_capability( "demux2", 1 );
add_shortcut( "dvdnav" );
set_callbacks( DemuxOpen, DemuxClose );
/* Configure dvdnav */
if( dvdnav_set_readahead_flag( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK )
{
- msg_Warn( p_demux, "cannot set readahead flag" );
+ msg_Warn( p_demux, "cannot set read-a-head flag" );
}
if( dvdnav_set_PGC_positioning_flag( p_sys->dvdnav, 1 ) !=
val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val );
vlc_mutex_unlock( p_mutex );
- msg_Dbg( p_demux, "ButtonUpdate %d", i_button );
+ msg_Dbg( p_demux, "buttonUpdate %d", i_button );
}
else
{
- msg_Dbg( p_demux, "ButtonUpdate not done b=%d t=%d", i_button, i_title );
+ msg_Dbg( p_demux, "buttonUpdate not done b=%d t=%d", i_button, i_title );
/* Show all */
vlc_mutex_lock( p_mutex );
/*****************************************************************************
* flac.c : FLAC demux module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: flac.c,v 1.9 2003/11/24 00:39:01 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: flac.c,v 1.10 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("flac demuxer") );
+ set_description( _("FLAC demuxer") );
set_capability( "demux", 155 );
set_callbacks( Open, Close );
add_shortcut( "flac" );
i_peek = stream_Peek( p_input->s, &p_peek, 8 );
if( p_peek[4] & 0x7F )
{
- msg_Err( p_input, "This isn't a STREAMINFO metadata block" );
+ msg_Err( p_input, "this isn't a STREAMINFO metadata block" );
return VLC_EGENERIC;
}
if( ((p_peek[5]<<16)+(p_peek[6]<<8)+p_peek[7]) != (STREAMINFO_SIZE - 4) )
{
- msg_Err( p_input, "Invalid size for a STREAMINFO metadata block" );
+ msg_Err( p_input, "invalid size for a STREAMINFO metadata block" );
return VLC_EGENERIC;
}
* live.cpp : live.com support.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
- * $Id: livedotcom.cpp,v 1.13 2003/12/04 18:13:28 gbazin Exp $
+ * $Id: livedotcom.cpp,v 1.14 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static int AccessOpen ( vlc_object_t * );
static void AccessClose( vlc_object_t * );
-#define CACHING_TEXT N_("Caching value in ms")
+#define CACHING_TEXT N_("Caching value (ms)")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for rtsp streams. This " \
"value should be set in miliseconds units." )
add_shortcut( "sdp" );
set_capability( "access", 0 );
set_callbacks( AccessOpen, AccessClose );
- add_category_hint( N_("RTSP"), NULL, VLC_TRUE );
- add_bool( "rtsp-tcp", 0, NULL,
- "Use rtp over rtsp(tcp)",
- "Use rtp over rtsp(tcp)", VLC_TRUE );
- add_integer( "rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ add_bool( "rtsp-tcp", 0, NULL,
+ N_("Use rtp over rtsp (tcp)"),
+ N_("Use rtp over rtsp (tcp)"), VLC_TRUE );
+ add_integer( "rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
+ CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
vlc_module_end();
/* TODO:
if( p_sys->i_track <= 0 )
{
- msg_Err( p_input, "No codec supported, aborting" );
+ msg_Err( p_input, "no codec supported, aborting" );
goto error;
}
/*****************************************************************************
* m3u.c: a meta demux to parse pls, m3u, asx et b4s playlists
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: m3u.c,v 1.25 2004/01/05 13:07:02 zorglub Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: m3u.c,v 1.26 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* Gildas Bazin <gbazin@netcourrier.com>
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("playlist metademux") );
+ set_description( _("Playlist metademux") );
set_capability( "demux", 180 );
set_callbacks( Activate, Deactivate );
add_shortcut( "m3u" );
/* we had no luck looking at the file extention, so we have a look
* at the content. This is useful for .asp, .php and similar files
- * that are actually html. Also useful for som asx files that have
- * another extention */
+ * that are actually html. Also useful for some asx files that have
+ * another extension */
/* XXX we double check for file != m3u as some asx ... are just m3u file */
if( i_type != TYPE_M3U )
{
/*****************************************************************************
* mkv.cpp : matroska demuxer
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: mkv.cpp,v 1.54 2004/01/22 20:48:07 sigmunau Exp $
+ * Copyright (C) 2003-2004 VideoLAN
+ * $Id: mkv.cpp,v 1.55 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static void Close( vlc_object_t * );
vlc_module_begin();
- add_category_hint( N_("mkv demuxer"), NULL, VLC_TRUE );
- add_bool( "mkv-seek-percent", 1, NULL,
- N_("Seek based on percent not time"),
- N_("Seek based on percent not time"), VLC_TRUE );
-
- set_description( _("mka/mkv stream demuxer" ) );
+ set_description( _("Matroska stream demuxer" ) );
set_capability( "demux", 50 );
set_callbacks( Open, Close );
+
+ add_bool( "mkv-seek-percent", 1, NULL,
+ N_("Seek based on percent not time"),
+ N_("Seek based on percent not time"), VLC_TRUE );
+
add_shortcut( "mka" );
add_shortcut( "mkv" );
vlc_module_end();
{
int64_t i_pos = i_percent * stream_Size( p_input->s ) / 100;
- msg_Dbg( p_input, "imprecise way of seeking" );
+ msg_Dbg( p_input, "inacurate way of seeking" );
for( i_index = 0; i_index < p_sys->i_index; i_index++ )
{
if( p_sys->index[i_index].i_position >= i_pos)
playlist_t *p_playlist;
int i_track;
- p_cat = input_InfoCategory( p_input, "Matroska" );
+ p_cat = input_InfoCategory( p_input, _("Matroska") );
if( p_sys->f_duration > 1000.1 )
{
char psz_buffer[MSTRTIME_MAX_SIZE];
* mod.c: MOD file demuxer (using libmodplug)
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: mod.c,v 1.1 2004/01/20 14:58:07 fenrir Exp $
+ * $Id: mod.c,v 1.2 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static void Close ( vlc_object_t * );
vlc_module_begin();
- set_description( N_("MOD demuxer (libmodplug)" ) );
- add_category_hint( N_("MOD demuxer"), NULL, VLC_TRUE );
- add_bool( "mod-noisereduction", VLC_TRUE, NULL, N_("Noise reduction"), N_("Noise reduction"), VLC_FALSE );
+ set_description( _("MOD demuxer (libmodplug)" ) );
+ set_capability( "demux2", 10 );
- add_bool( "mod-reverb", VLC_FALSE, NULL, N_("Reverb"), N_("Reverb"), VLC_FALSE );
- add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, N_("Reverb level"), N_("Reverb level (0-100)"), VLC_FALSE );
- add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, N_("Reverb delay (ms)"), N_("Reverb delay in ms (usually 40-200ms)"), VLC_FALSE );
+ add_bool( "mod-noisereduction", VLC_TRUE, NULL, N_("Noise reduction"), N_("Noise reduction"), VLC_FALSE );
- add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"), N_("Mega bass"), VLC_FALSE );
- add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, N_("Mega bass level"), N_("Mega bass level"), VLC_FALSE );
- add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, N_("Mega bass cutt off"), N_("Mega bass cutt off (10-100Hz)"), VLC_FALSE );
+ add_bool( "mod-reverb", VLC_FALSE, NULL, N_("Reverb"), N_("Reverb"), VLC_FALSE );
+ add_integer_with_range( "mod-reverb-level", 0, 0, 100, NULL, N_("Reverb level (0-100)"), N_("Reverb level (0-100 defaults to 0)"), VLC_FALSE );
+ add_integer_with_range( "mod-reverb-delay", 40, 0, 1000, NULL, N_("Reverb delay (ms)"), N_("Reverb delay in ms (usually 40-200ms)"), VLC_FALSE );
- add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"), VLC_FALSE );
- add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, N_("Surround level"), N_("Surround level (0-100)"), VLC_FALSE );
- add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, N_("Surround delay (ms)"), N_("Surround delay in ms (usually 5-40ms)"), VLC_FALSE );
+ add_bool( "mod-megabass", VLC_FALSE, NULL, N_("Mega bass"), N_("Mega bass"), VLC_FALSE );
+ add_integer_with_range( "mod-megabass-level", 0, 0, 100, NULL, N_("Mega bass level (0-100)"), N_("Mega bass level (0-100 defaults to 0)"), VLC_FALSE );
+ add_integer_with_range( "mod-megabass-range", 10, 10, 100, NULL, N_("Mega bass cutt off (Hz)"), N_("Mega bass cutt off (10-100Hz)"), VLC_FALSE );
+
+ add_bool( "mod-surround", VLC_FALSE, NULL, N_("Surround"), N_("Surround"), VLC_FALSE );
+ add_integer_with_range( "mod-surround-level", 0, 0, 100, NULL, N_("Surround level (0-100)"), N_("Surround level (0-100 defaults to 0)"), VLC_FALSE );
+ add_integer_with_range( "mod-surround-delay", 5, 0, 1000, NULL, N_("Surround delay (ms)"), N_("Surround delay in ms (usually 5-40ms)"), VLC_FALSE );
- set_capability( "demux2", 10 );
set_callbacks( Open, Close );
add_shortcut( "mod" );
vlc_module_end();
/*****************************************************************************
* libmp4.c : LibMP4 library for mp4 module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libmp4.c,v 1.44 2004/01/18 22:00:00 fenrir Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: libmp4.c,v 1.45 2004/01/25 20:05:28 hartman Exp $
*
* Author: Laurent Aimar <fenrir@via.ecp.fr>
*
#ifdef MP4_VERBOSE
if( p_box->i_size )
{
- msg_Dbg( p_stream->p_input, "Found Box: %4.4s size "I64Fd,
+ msg_Dbg( p_stream->p_input, "found Box: %4.4s size "I64Fd,
(char*)&p_box->i_type,
p_box->i_size );
}
if( i_fcc == FOURCC_cmov || i_fcc == FOURCC_mvhd )
{
- msg_Warn( p_stream->p_input, "Detected moov hidden in a free box ..." );
+ msg_Warn( p_stream->p_input, "detected moov hidden in a free box ..." );
p_box->i_type = FOURCC_foov;
return MP4_ReadBoxContainer( p_stream, p_box );
}
/* Nothing to do */
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Skip box: \"%4.4s\"",
+ msg_Dbg( p_stream->p_input, "skip box: \"%4.4s\"",
(char*)&p_box->i_type );
#endif
return( 1 );
{
s_duration[0] = 0;
}
- msg_Dbg( p_stream->p_input, "Read Box: \"mvhd\" creation %s modification %s time scale %d duration %s rate %f volume %f next track id %d",
+ msg_Dbg( p_stream->p_input, "read box: \"mvhd\" creation %s modification %s time scale %d duration %s rate %f volume %f next track id %d",
s_creation_time,
s_modification_time,
(uint32_t)p_box->data.p_mvhd->i_timescale,
MP4_ConvertDate2Str( s_modification_time, p_box->data.p_mvhd->i_modification_time );
MP4_ConvertDate2Str( s_duration, p_box->data.p_mvhd->i_duration );
- msg_Dbg( p_stream->p_input, "Read Box: \"tkhd\" creation %s modification %s duration %s track ID %d layer %d volume %f width %f height %f",
+ msg_Dbg( p_stream->p_input, "read box: \"tkhd\" creation %s modification %s duration %s track ID %d layer %d volume %f width %f height %f",
s_creation_time,
s_modification_time,
s_duration,
MP4_ConvertDate2Str( s_creation_time, p_box->data.p_mdhd->i_creation_time );
MP4_ConvertDate2Str( s_modification_time, p_box->data.p_mdhd->i_modification_time );
MP4_ConvertDate2Str( s_duration, p_box->data.p_mdhd->i_duration );
- msg_Dbg( p_stream->p_input, "Read Box: \"mdhd\" creation %s modification %s time scale %d duration %s language %c%c%c",
+ msg_Dbg( p_stream->p_input, "read box: \"mdhd\" creation %s modification %s time scale %d duration %s language %c%c%c",
s_creation_time,
s_modification_time,
(uint32_t)p_box->data.p_mdhd->i_timescale,
memcpy( p_box->data.p_hdlr->psz_name, p_peek, i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"hdlr\" hanler type %4.4s name %s",
+ msg_Dbg( p_stream->p_input, "read box: \"hdlr\" hanler type %4.4s name %s",
(char*)&p_box->data.p_hdlr->i_handler_type,
p_box->data.p_hdlr->psz_name );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"vmhd\" graphics-mode %d opcolor (%d, %d, %d)",
+ msg_Dbg( p_stream->p_input, "read box: \"vmhd\" graphics-mode %d opcolor (%d, %d, %d)",
p_box->data.p_vmhd->i_graphics_mode,
p_box->data.p_vmhd->i_opcolor[0],
p_box->data.p_vmhd->i_opcolor[1],
MP4_GET2BYTES( p_box->data.p_smhd->i_reserved );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"smhd\" balance %f",
+ msg_Dbg( p_stream->p_input, "read box: \"smhd\" balance %f",
(float)p_box->data.p_smhd->i_balance / 256 );
#endif
MP4_READBOX_EXIT( 1 );
MP4_GET4BYTES( p_box->data.p_hmhd->i_reserved );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"hmhd\" maxPDU-size %d avgPDU-size %d max-bitrate %d avg-bitrate %d",
+ msg_Dbg( p_stream->p_input, "read box: \"hmhd\" maxPDU-size %d avgPDU-size %d max-bitrate %d avg-bitrate %d",
p_box->data.p_hmhd->i_max_PDU_size,
p_box->data.p_hmhd->i_avg_PDU_size,
p_box->data.p_hmhd->i_max_bitrate,
MP4_GETSTRINGZ( p_box->data.p_url->psz_location );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"url\" url: %s",
+ msg_Dbg( p_stream->p_input, "read box: \"url\" url: %s",
p_box->data.p_url->psz_location );
#endif
MP4_GETSTRINGZ( p_box->data.p_urn->psz_location );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"urn\" name %s location %s",
+ msg_Dbg( p_stream->p_input, "read box: \"urn\" name %s location %s",
p_box->data.p_urn->psz_name,
p_box->data.p_urn->psz_location );
#endif
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"dref\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"dref\" entry-count %d",
p_box->data.p_dref->i_entry_count );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stts\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"stts\" entry-count %d",
p_box->data.p_stts->i_entry_count );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"ctts\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"ctts\" entry-count %d",
p_box->data.p_ctts->i_entry_count );
#endif
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Found esds MPEG4ESDescr (%dBytes)",
+ msg_Dbg( p_stream->p_input, "found esds MPEG4ESDescr (%dBytes)",
i_len );
#endif
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Found esds MP4DecConfigDescr (%dBytes)",
+ msg_Dbg( p_stream->p_input, "found esds MP4DecConfigDescr (%dBytes)",
i_len );
#endif
i_len = MP4_ReadLengthDescriptor( &p_peek, &i_read );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Found esds MP4DecSpecificDescr (%dBytes)",
+ msg_Dbg( p_stream->p_input, "found esds MP4DecSpecificDescr (%dBytes)",
i_len );
#endif
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"soun\" qt3+ sample/packet=%d bytes/packet=%d bytes/frame=%d bytes/sample=%d",
+ "read box: \"soun\" qt3+ sample/packet=%d bytes/packet=%d bytes/frame=%d bytes/sample=%d",
p_box->data.p_sample_soun->i_sample_per_packet, p_box->data.p_sample_soun->i_bytes_per_packet,
p_box->data.p_sample_soun->i_bytes_per_frame, p_box->data.p_sample_soun->i_bytes_per_sample );
#endif
p_box->data.p_sample_soun->i_bytes_per_frame = 0;
p_box->data.p_sample_soun->i_bytes_per_sample = 0;
- msg_Dbg( p_stream->p_input, "Read Box: \"soun\" mp4 or qt1/2 (rest="I64Fd")", i_read );
+ msg_Dbg( p_stream->p_input, "read box: \"soun\" mp4 or qt1/2 (rest="I64Fd")", i_read );
MP4_SeekStream( p_stream, p_box->i_pos + MP4_BOX_HEADERSIZE( p_box ) + 28 );
}
MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"soun\" in stsd channel %d sample size %d sampl rate %f",
+ msg_Dbg( p_stream->p_input, "read box: \"soun\" in stsd channel %d sample size %d sampl rate %f",
p_box->data.p_sample_soun->i_channelcount,
p_box->data.p_sample_soun->i_samplesize,
(float)p_box->data.p_sample_soun->i_sampleratehi +
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"vide\" in stsd %dx%d depth %d",
+ msg_Dbg( p_stream->p_input, "read box: \"vide\" in stsd %dx%d depth %d",
p_box->data.p_sample_vide->i_width,
p_box->data.p_sample_vide->i_height,
p_box->data.p_sample_vide->i_depth );
MP4_ReadBoxContainerRaw( p_stream, p_box );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stsd\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"stsd\" entry-count %d",
p_box->data.p_stsd->i_entry_count );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stsz\" sample-size %d sample-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"stsz\" sample-size %d sample-count %d",
p_box->data.p_stsz->i_sample_size,
p_box->data.p_stsz->i_sample_count );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stsc\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"stsc\" entry-count %d",
p_box->data.p_stsc->i_entry_count );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"co64\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"co64\" entry-count %d",
p_box->data.p_co64->i_entry_count );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stss\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"stss\" entry-count %d",
p_box->data.p_stss->i_entry_count );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stsh\" entry-count %d",
+ msg_Dbg( p_stream->p_input, "read box: \"stsh\" entry-count %d",
p_box->data.p_stsh->i_entry_count );
#endif
MP4_READBOX_EXIT( 1 );
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count "I64Fd,
+ msg_Dbg( p_stream->p_input, "read box: \"stdp\" entry-count "I64Fd,
i_read / 2 );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"stdp\" entry-count "I64Fd,
+ msg_Dbg( p_stream->p_input, "read box: \"stdp\" entry-count "I64Fd,
i_read / 2 );
#endif
}
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"elst\" entry-count "I64Fd,
+ msg_Dbg( p_stream->p_input, "read box: \"elst\" entry-count "I64Fd,
i_read / 2 );
#endif
MP4_GETSTRINGZ( p_box->data.p_cprt->psz_notice );
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"cprt\" language %c%c%c notice %s",
+ msg_Dbg( p_stream->p_input, "read box: \"cprt\" language %c%c%c notice %s",
p_box->data.p_cprt->i_language[0],
p_box->data.p_cprt->i_language[1],
p_box->data.p_cprt->i_language[2],
MP4_GETFOURCC( p_box->data.p_dcom->i_algorithm );
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"dcom\" compression algorithm : %4.4s",
+ "read box: \"dcom\" compression algorithm : %4.4s",
(char*)&p_box->data.p_dcom->i_algorithm );
#endif
MP4_READBOX_EXIT( 1 );
if( !( p_box->data.p_cmvd->p_data = malloc( i_read ) ) )
{
- msg_Dbg( p_stream->p_input, "Read Box: \"cmvd\" not enough memory to load data" );
+ msg_Dbg( p_stream->p_input, "read box: \"cmvd\" not enough memory to load data" );
return( 1 );
}
p_box->data.p_cmvd->b_compressed = 1;
#ifdef MP4_VERBOSE
- msg_Dbg( p_stream->p_input, "Read Box: \"cmvd\" compressed data size %d",
+ msg_Dbg( p_stream->p_input, "read box: \"cmvd\" compressed data size %d",
p_box->data.p_cmvd->i_compressed_size );
#endif
( p_cmvd = MP4_BoxGet( p_box, "cmvd" ) ) == NULL ||
p_cmvd->data.p_cmvd->p_data == NULL )
{
- msg_Warn( p_stream->p_input, "Read Box: \"cmov\" incomplete" );
+ msg_Warn( p_stream->p_input, "read box: \"cmov\" incomplete" );
return( 1 );
}
if( p_dcom->data.p_dcom->i_algorithm != FOURCC_zlib )
{
- msg_Dbg( p_stream->p_input, "Read Box: \"cmov\" compression algorithm : %4.4s not supported",
+ msg_Dbg( p_stream->p_input, "read box: \"cmov\" compression algorithm : %4.4s not supported",
(char*)&p_dcom->data.p_dcom->i_algorithm );
return( 1 );
}
#ifndef HAVE_ZLIB_H
msg_Dbg( p_stream->p_input,
- "Read Box: \"cmov\" zlib unsupported" );
+ "read box: \"cmov\" zlib unsupported" );
return( 1 );
#else
/* decompress data */
if( !( p_data = malloc( p_cmvd->data.p_cmvd->i_uncompressed_size ) ) )
{
msg_Err( p_stream->p_input,
- "Read Box: \"cmov\" not enough memory to uncompress data" );
+ "read box: \"cmov\" not enough memory to uncompress data" );
return( 1 );
}
/* init default structures */
if( ( i_result = inflateInit( &z_data ) ) != Z_OK )
{
msg_Err( p_stream->p_input,
- "Read Box: \"cmov\" error while uncompressing data" );
+ "read box: \"cmov\" error while uncompressing data" );
free( p_data );
return( 1 );
}
if( ( i_result != Z_OK )&&( i_result != Z_STREAM_END ) )
{
msg_Err( p_stream->p_input,
- "Read Box: \"cmov\" error while uncompressing data" );
+ "read box: \"cmov\" error while uncompressing data" );
free( p_data );
return( 1 );
}
if( p_cmvd->data.p_cmvd->i_uncompressed_size != z_data.total_out )
{
msg_Warn( p_stream->p_input,
- "Read Box: \"cmov\" uncompressing data size mismatch" );
+ "read box: \"cmov\" uncompressing data size mismatch" );
}
p_cmvd->data.p_cmvd->i_uncompressed_size = z_data.total_out;
if( i_result != Z_OK )
{
msg_Warn( p_stream->p_input,
- "Read Box: \"cmov\" error while uncompressing data (ignored)" );
+ "read box: \"cmov\" error while uncompressing data (ignored)" );
}
p_cmvd->data.p_cmvd->b_compressed = 0;
msg_Dbg( p_stream->p_input,
- "Read Box: \"cmov\" box succesfully uncompressed" );
+ "read box: \"cmov\" box succesfully uncompressed" );
/* now create a memory stream */
p_stream_memory = MP4_MemoryStream( p_stream->p_input,
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"cmov\" compressed movie header completed" );
+ "read box: \"cmov\" compressed movie header completed" );
#endif
return( p_box->data.p_cmov->p_moov ? 1 : 0 );
#endif /* HAVE_ZLIB_H */
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"rdrf\" type:%4.4s ref %s",
+ "read box: \"rdrf\" type:%4.4s ref %s",
(char*)&p_box->data.p_rdrf->i_ref_type,
p_box->data.p_rdrf->psz_ref );
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"rmdr\" rate:%d",
+ "read box: \"rmdr\" rate:%d",
p_box->data.p_rmdr->i_rate );
#endif
MP4_READBOX_EXIT( 1 );
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"rmqu\" quality:%d",
+ "read box: \"rmqu\" quality:%d",
p_box->data.p_rmqu->i_quality );
#endif
MP4_READBOX_EXIT( 1 );
#ifdef MP4_VERBOSE
msg_Dbg( p_stream->p_input,
- "Read Box: \"rmvc\" gestaltType:%4.4s val1:0x%x val2:0x%x checkType:0x%x",
+ "read box: \"rmvc\" gestaltType:%4.4s val1:0x%x val2:0x%x checkType:0x%x",
(char*)&p_box->data.p_rmvc->i_gestaltType,
p_box->data.p_rmvc->i_val1,p_box->data.p_rmvc->i_val2,
p_box->data.p_rmvc->i_checkType );
if( !MP4_ReadBoxCommon( p_stream, p_box ) )
{
- msg_Warn( p_stream->p_input, "Cannot read one box" );
+ msg_Warn( p_stream->p_input, "cannot read one box" );
free( p_box );
return NULL;
}
if( !p_box->i_size )
{
- msg_Dbg( p_stream->p_input, "Found an empty box (null size)" );
+ msg_Dbg( p_stream->p_input, "found an empty box (null size)" );
free( p_box );
return NULL;
}
if( MP4_Box_Function[i_index].MP4_ReadBox_function == NULL )
{
msg_Warn( p_stream->p_input,
- "Unknown box type %4.4s (uncompletetly loaded)",
+ "unknown box type %4.4s (uncompletetly loaded)",
(char*)&p_box->i_type );
}
else if( !(MP4_Box_Function[i_index].MP4_ReadBox_function)( p_stream, p_box ) )
if( !i_level )
{
- msg_Dbg( p_input, "Dumping root Box \"%4.4s\"",
+ msg_Dbg( p_input, "dumping root Box \"%4.4s\"",
(char*)&p_box->i_type );
}
else
/*****************************************************************************
* libmp4.h : LibMP4 library for mp4 module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: libmp4.h,v 1.19 2004/01/09 04:37:43 jlj Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: libmp4.h,v 1.20 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
/*****************************************************************************
* mp4.c : MP4 file input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: mp4.c,v 1.56 2004/01/23 08:07:17 gbazin Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: mp4.c,v 1.57 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("MP4 demuxer") );
+ set_description( _("MP4 stream demuxer") );
set_capability( "demux", 242 );
set_callbacks( Open, Close );
vlc_module_end();
p_track->chunk[p_track->i_chunk].i_sample_description_index !=
p_track->chunk[i_chunk].i_sample_description_index )
{
- msg_Warn( p_input, "Recreate ES" );
+ msg_Warn( p_input, "recreate ES" );
es_out_Control( p_input->p_es_out, ES_OUT_GET_ES_STATE, p_track->p_es, &b_reselect );
/*****************************************************************************
* mp4.h : MP4 file input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: mp4.h,v 1.13 2004/01/18 22:00:00 fenrir Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: mp4.h,v 1.14 2004/01/25 20:05:28 hartman Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
/*****************************************************************************
* mpga.c : MPEG-I/II Audio input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: mpga.c,v 1.15 2004/01/03 00:23:04 gbazin Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: mpga.c,v 1.16 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/*****************************************************************************
* mpgv.c : MPEG-I/II Video demuxer
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: mpgv.c,v 1.4 2003/12/22 02:24:52 sam Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: mpgv.c,v 1.5 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
/*****************************************************************************
* ps.c : Program Stream input module for vlc
*****************************************************************************
- * Copyright (C) 2000-2001, 2004 VideoLAN
- * $Id: ps.c,v 1.16 2004/01/11 15:02:15 rocky Exp $
+ * Copyright (C) 2000-2004, 2004 VideoLAN
+ * $Id: ps.c,v 1.17 2004/01/25 20:05:28 hartman Exp $
*
* Author: Christophe Massiot <massiot@via.ecp.fr>
*
/*****************************************************************************
* system.c: helper module for TS, PS and PES management
*****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
- * $Id: system.c,v 1.29 2004/01/24 03:48:29 rocky Exp $
+ * Copyright (C) 1998-2004 VideoLAN
+ * $Id: system.c,v 1.30 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("generic ISO 13818-1 MPEG demultiplexing") );
+ set_description( _("Generic ISO 13818-1 MPEG demultiplexing") );
set_capability( "mpeg-system", 100 );
-set_callbacks( Activate, NULL );
+ set_callbacks( Activate, NULL );
vlc_module_end();
/*****************************************************************************
/*****************************************************************************
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
- * Copyright (C) 2000, 2001, 2003 VideoLAN
- * $Id: ts.c,v 1.45 2004/01/15 22:15:40 gbazin Exp $
+ * Copyright (C) 2000-2004 VideoLAN
+ * $Id: ts.c,v 1.46 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
set_capability( "demux", 170 );
add_shortcut( "ts_dvbpsi" );
#endif
- add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );
+
add_bool( "vls-backwards-compat", 0, NULL,
VLS_BACKWARDS_COMPAT_TEXT, VLS_BACKWARDS_COMPAT_LONGTEXT, VLC_TRUE );
add_bool( "buggy-psi", 0, NULL, BUGGY_PSI_TEXT, BUGGY_PSI_LONGTEXT, VLC_TRUE );
( p_new_pat->i_version != p_stream_data->i_pat_version ) ) ||
p_stream_data->i_pat_version == PAT_UNINITIALIZED )
{
- msg_Dbg( p_input, "Processing PAT version %d", p_new_pat->i_version );
+ msg_Dbg( p_input, "processing PAT version %d", p_new_pat->i_version );
/* Delete all programs */
while( p_input->stream.i_pgrm_number )
while( p_pgrm )
{
- msg_Dbg( p_input, "New program: %d", p_pgrm->i_number );
+ msg_Dbg( p_input, "new program: %d", p_pgrm->i_number );
/* If program = 0, we're having info about NIT not PMT */
if( p_pgrm->i_number )
dvbpsi_descriptor_t *p_dr = p_new_pmt->p_first_descriptor;
int i_loop;
- msg_Dbg( p_input, "Processing PMT for program %d version %d",
+ msg_Dbg( p_input, "processing PMT for program %d version %d",
p_new_pmt->i_program_number, p_new_pmt->i_version );
/* Delete all ES in this program except the PSI. We start from the
if( i_fourcc == VLC_FOURCC(0,0,0,0) )
{
msg_Warn( p_input,
- "Unknown codec/type for Private PES stream" );
+ "unknown codec/type for Private PES stream" );
}
}
* nsv.c: NullSoft Video demuxer.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: nsv.c,v 1.4 2004/01/07 15:31:31 fenrir Exp $
+ * $Id: nsv.c,v 1.5 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
uint8_t *p;
int i_size;
- msg_Dbg( p_demux, "New NSVf chunk" );
+ msg_Dbg( p_demux, "new NSVf chunk" );
if( stream_Peek( p_demux->s, &p, 8 ) < 8 )
{
return VLC_EGENERIC;
return VLC_EGENERIC;
}
- msg_Dbg( p_demux, "New NSVs chunk" );
+ msg_Dbg( p_demux, "new NSVs chunk" );
/* Video */
switch( ( fcc = VLC_FOURCC( header[4], header[5], header[6], header[7] ) ) )
{
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
break;
default:
- msg_Warn( p_demux, "unknow codec" );
+ msg_Warn( p_demux, "unknown codec" );
break;
}
if( fcc != VLC_FOURCC( 'N', 'O', 'N', 'E' ) && fcc != p_sys->fmt_video.i_codec )
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
break;
default:
- msg_Warn( p_demux, "unknow codec" );
+ msg_Warn( p_demux, "unknown codec" );
break;
}
p_sys->i_pcr_inc = 66755;
break;
default:
- msg_Dbg( p_demux, "unknow fps (0x%x)", header[16] );
+ msg_Dbg( p_demux, "unknown fps (0x%x)", header[16] );
p_sys->i_pcr_inc = 40000;
break;
}
/*****************************************************************************
- * ogg.c : ogg stream input module for vlc
+ * ogg.c : ogg stream demux module for vlc
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: ogg.c,v 1.52 2003/12/22 14:32:55 sam Exp $
+ * $Id: ogg.c,v 1.53 2004/01/25 20:05:28 hartman Exp $
*
* Author: Gildas Bazin <gbazin@netcourrier.com>
*
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("ogg stream demuxer" ) );
+ set_description( _("Ogg stream demuxer" ) );
set_capability( "demux", 50 );
set_callbacks( Activate, Deactivate );
add_shortcut( "ogg" );
p_stream->fmt.audio.i_channels =
bs_read( &s, 3 ) + 1;
- msg_Dbg( p_input, "Flac header, channels: %i, rate: %i",
+ msg_Dbg( p_input, "FLAC header, channels: %i, rate: %i",
p_stream->fmt.audio.i_channels,
(int)p_stream->f_rate );
}
if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
{
/* FIXME: the biggest hack I've ever done */
- msg_Warn( p_input, "tark pts: "I64Fd", granule: "I64Fd,
+ msg_Warn( p_input, "tarkin pts: "I64Fd", granule: "I64Fd,
p_block->i_pts, p_block->i_dts );
msleep(10000);
}
if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
{
/* error. stream version mismatch perhaps */
- msg_Err( p_input, "Error reading first page of "
+ msg_Err( p_input, "error reading first page of "
"Ogg bitstream data" );
return VLC_EGENERIC;
}
else if( oggpacket.bytes >= 4 &&
! strncmp( &oggpacket.packet[0], "fLaC", 4 ) )
{
- msg_Dbg( p_input, "found Flac header" );
+ msg_Dbg( p_input, "found FLAC header" );
/* Grrrr!!!! Did they really have to put all the
* important info in the second header packet!!!
* m3u.c : M3U playlist format import
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: m3u.c,v 1.2 2004/01/11 17:46:58 sigmunau Exp $
+ * $Id: m3u.c,v 1.3 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
return VLC_EGENERIC;
}
- msg_Info( p_demux, "Found valid M3U playlist file");
+ msg_Dbg( p_demux, "found valid M3U playlist file");
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
* old.c : Old playlist format import
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: old.c,v 1.1 2004/01/11 00:45:06 zorglub Exp $
+ * $Id: old.c,v 1.2 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
msg_Warn(p_demux, "old import module discarded: invalid file");
return VLC_EGENERIC;
}
- msg_Info( p_demux, "Found valid old playlist file");
+ msg_Dbg( p_demux, "found valid old playlist file");
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
* playlist.c : Playlist import module
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: playlist.c,v 1.2 2004/01/11 17:46:58 sigmunau Exp $
+ * $Id: playlist.c,v 1.3 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
*
* Module descriptor
*****************************************************************************/
vlc_module_begin();
-
add_shortcut( "playlist" );
set_description( _("Old playlist open") );
* pls.c : PLS playlist format import
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: pls.c,v 1.1 2004/01/11 17:46:58 sigmunau Exp $
+ * $Id: pls.c,v 1.2 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
return VLC_EGENERIC;
}
- msg_Info( p_demux, "Found valid PLS playlist file");
+ msg_Dbg( p_demux, "found valid PLS playlist file");
p_demux->pf_control = Control;
p_demux->pf_demux = Demux;
}
if( i_new_item == 0 )
{
- msg_Warn( p_demux, "couldn't find number of item" );
+ msg_Warn( p_demux, "couldn't find number of items" );
free( psz_line );
continue;
}
* ps.c
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: ps.c,v 1.1 2004/01/17 22:32:50 fenrir Exp $
+ * $Id: ps.c,v 1.2 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
static void Close ( vlc_object_t * );
vlc_module_begin();
- set_description( "PS demuxer" );
+ set_description( _("PS demuxer") );
set_capability( "demux2", 0 );
set_callbacks( Open, Close );
add_shortcut( "ps2" );
/*****************************************************************************
* rawdv.c : raw dv input module for vlc
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: rawdv.c,v 1.13 2003/11/27 04:11:40 fenrir Exp $
+ * Copyright (C) 2001-2003 VideoLAN
+ * $Id: rawdv.c,v 1.14 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
* real.c: Real demuxer.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: real.c,v 1.2 2004/01/07 15:31:31 fenrir Exp $
+ * $Id: real.c,v 1.3 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
if( HeaderRead( p_demux ) )
{
int i;
- msg_Err( p_demux, "Invalid header" );
+ msg_Err( p_demux, "invalid header" );
for( i = 0; i < p_sys->i_track; i++ )
{
real_track_t *tk = p_sys->track[i];
i_size = GetDWBE( &header[4] );
i_version = GetWBE( &header[8] );
- msg_Dbg( p_demux, "Object %4.4s size=%d version=%d",
+ msg_Dbg( p_demux, "object %4.4s size=%d version=%d",
(char*)&i_id, i_size, i_version );
if( i_size < 10 )
* ts.c: Transport Stream input module for VLC.
*****************************************************************************
* Copyright (C) 2004 VideoLAN
- * $Id: ts.c,v 1.7 2004/01/25 02:26:04 fenrir Exp $
+ * $Id: ts.c,v 1.8 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
vlc_module_begin();
set_description( _("ISO 13818-1 MPEG Transport Stream input - new" ) );
- add_category_hint( "TS demuxer", NULL, VLC_TRUE );
- add_string( "ts-extra-pmt", NULL, NULL, "extra PMT", "allow user to specify an extra pmt (pmt_pid=pid:stream_type[,...])", VLC_TRUE );
- add_bool( "ts-es-id-pid", 0, NULL, "set id of es to pid", "set id of es to pid", VLC_TRUE );
- add_string( "ts-out", NULL, NULL, "fast udp streaming", "send TS to specific ip:port by udp (you must know what you are doing)", VLC_TRUE );
- add_integer( "ts-out-mtu", 1500, NULL, "MTU for out mode", "MTU for out mode", VLC_TRUE );
- add_string( "ts-csa-ck", NULL, NULL, "CSA ck", "CSA ck", VLC_TRUE );
+ add_string( "ts-extra-pmt", NULL, NULL, "extra PMT", "allow user to specify an extra pmt (pmt_pid=pid:stream_type[,...])", VLC_TRUE );
+ add_bool( "ts-es-id-pid", 0, NULL, "set id of es to pid", "set id of es to pid", VLC_TRUE );
+ add_string( "ts-out", NULL, NULL, "fast udp streaming", "send TS to specific ip:port by udp (you must know what you are doing)", VLC_TRUE );
+ add_integer( "ts-out-mtu", 1500, NULL, "MTU for out mode", "MTU for out mode", VLC_TRUE );
+ add_string( "ts-csa-ck", NULL, NULL, "CSA ck", "CSA ck", VLC_TRUE );
set_capability( "demux2", 10 );
set_callbacks( Open, Close );
add_shortcut( "ts2" );
{
ts_pid_t *pmt = &p_sys->pid[i_pid];
- msg_Dbg( p_demux, "Extra pmt specified (pid=0x%x)", i_pid );
+ msg_Dbg( p_demux, "extra pmt specified (pid=0x%x)", i_pid );
PIDInit( pmt, VLC_TRUE, NULL );
/* FIXME we should also ask for a number */
pmt->psi->handle = dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux );
pmt->psi->iod = NULL;
}
- msg_Dbg( p_demux, "New PMT program number=%d version=%d pid_pcr=0x%x", p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
+ msg_Dbg( p_demux, "new PMT program number=%d version=%d pid_pcr=0x%x", p_pmt->i_program_number, p_pmt->i_version, p_pmt->i_pcr_pid );
pmt->psi->i_pid_pcr = p_pmt->i_pcr_pid;
pmt->psi->i_version = p_pmt->i_version;
return;
}
- msg_Dbg( p_demux, "New PAT ts_id=0x%x version=%d current_next=%d", p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
+ msg_Dbg( p_demux, "new PAT ts_id=0x%x version=%d current_next=%d", p_pat->i_ts_id, p_pat->i_version, p_pat->b_current_next );
/* Clean old */
for( i = 2; i < 8192; i++ )
* id3.c: simple id3 tag skipper
*****************************************************************************
* Copyright (C) 2001 VideoLAN
- * $Id: id3.c,v 1.6 2003/11/02 22:15:14 gbazin Exp $
+ * $Id: id3.c,v 1.7 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
}
p_input = (input_thread_t *)p_this;
- msg_Dbg( p_input, "Checking for ID3 tag" );
+ msg_Dbg( p_input, "checking for ID3 tag" );
/* get 10 byte id3 header */
if( stream_Peek( p_input->s, &p_peek, 10 ) < 10 )
* id3genres.h: list of genres for id3 genre tags
*****************************************************************************
* Copyright (C) 2002-2003 VideoLAN
- * $Id: id3genres.h,v 1.3 2003/12/22 14:23:13 sam Exp $
+ * $Id: id3genres.h,v 1.4 2004/01/25 20:05:29 hartman Exp $
*
* Author: Sigmund Augdal <sigmunau@idi.ntnu.no>
* list found at http://www.id3.org/id3v2.4.0-frames.txt
N_("Sound clip"),
N_("Gospel"),
N_("Noise"),
- N_("Alternrock"),
+ N_("Alternative rock"),
N_("Bass"),
N_("Soul"),
N_("Punk"),
/*****************************************************************************
* id3tag.c: id3 tag parser/skipper based on libid3tag
*****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: id3tag.c,v 1.18 2004/01/05 13:00:20 zorglub Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id: id3tag.c,v 1.19 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
* Module descriptor
*****************************************************************************/
vlc_module_begin();
-set_description( _("id3 tag parser using libid3tag" ) );
+set_description( _("ID3 tag parser using libid3tag" ) );
set_capability( "id3", 70 );
set_callbacks( ParseID3Tags, NULL );
vlc_module_end();
var_Get( p_input, "demuxed-id3", &val );
if( val.b_bool )
{
- msg_Dbg( p_input, "The ID3 tag was already parsed" );
+ msg_Dbg( p_input, "the ID3 tag was already parsed" );
return;
}
}
p_input = (input_thread_t *)p_this;
- msg_Dbg( p_input, "Checking for ID3 tag" );
+ msg_Dbg( p_input, "checking for ID3 tag" );
if ( p_input->stream.b_seekable &&
p_input->stream.i_method != INPUT_METHOD_NETWORK )
msg_Err( p_input, "cannot peek()" );
return( VLC_EGENERIC );
}
- msg_Dbg( p_input, "Found ID3v1 tag" );
+ msg_Dbg( p_input, "found ID3v1 tag" );
ParseID3Tag( p_input, p_peek, i_size2 );
}
msg_Err( p_input, "cannot peek()" );
return( VLC_EGENERIC );
}
- msg_Dbg( p_input, "Found ID3v2 tag at end of file" );
+ msg_Dbg( p_input, "found ID3v2 tag at end of file" );
ParseID3Tag( p_input, p_peek, i_size2 );
}
}
p_peek = malloc( i_size );
if( !p_peek || stream_Read( p_input->s, p_peek, i_size ) < i_size )
{
- msg_Err( p_input, "Cannot read ID3 tag" );
+ msg_Err( p_input, "cannot read ID3 tag" );
if( p_peek ) free( p_peek );
return( VLC_EGENERIC );
}
ParseID3Tag( p_input, p_peek, i_size );
- msg_Dbg( p_input, "Found ID3v2 tag" );
+ msg_Dbg( p_input, "found ID3v2 tag" );
free( p_peek );
return( VLC_SUCCESS );
* sub.c
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
- * $Id: sub.c,v 1.40 2004/01/06 14:35:16 hartman Exp $
+ * $Id: sub.c,v 1.41 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
vlc_module_begin();
set_description( _("Text subtitles demux") );
set_capability( "subtitle demux", 12 );
- add_category_hint( "Subtitles", NULL, VLC_TRUE );
- add_float( "sub-fps", 25.0, NULL,
- "Frames per second",
- SUB_FPS_LONGTEXT, VLC_TRUE );
- add_integer( "sub-delay", 0, NULL,
- "Delay subtitles (in 1/10s)",
- SUB_DELAY_LONGTEXT, VLC_TRUE );
- add_string( "sub-type", "auto", NULL, "subtitles type",
- SUB_TYPE_LONGTEXT, VLC_TRUE );
- change_string_list( ppsz_sub_type, 0, 0 );
+ add_float( "sub-fps", 25.0, NULL,
+ N_("Frames per second"),
+ SUB_FPS_LONGTEXT, VLC_TRUE );
+ add_integer( "sub-delay", 0, NULL,
+ N_("Delay subtitles (in 1/10s)"),
+ SUB_DELAY_LONGTEXT, VLC_TRUE );
+ add_string( "sub-type", "auto", NULL, "Subtitles fileformat",
+ SUB_TYPE_LONGTEXT, VLC_TRUE );
+ change_string_list( ppsz_sub_type, 0, 0 );
set_callbacks( Open, NULL );
vlc_module_end();
i_line_max += 100;
txt->line = realloc( txt->line, i_line_max * sizeof( char*) );
}
+ printf( "hoi, %s", txt->line );
}
fclose( f );
text_t txt;
vlc_value_t val;
es_format_t fmt;
+ char *psz_vobname;
int i;
int i_sub_type;
free( psz_name );
return VLC_EGENERIC;
}
+
msg_Dbg( p_sub, "opened `%s'", psz_name );
+ psz_vobname = strdup( psz_name );
free( psz_name );
var_Get( p_sub, "sub-fps", &val );
/* *** add subtitle ES *** */
if( p_sub->i_sub_type == SUB_TYPE_VOBSUB )
{
+ int i_len = strlen( psz_vobname );
+ char *extension = psz_vobname + i_len - 4;
+
+ strcpy( extension, ".sub" );
+
+ /* open file */
+ if( !( p_sub->p_vobsub_file = fopen( psz_vobname, "rb" ) ) )
+ {
+ msg_Err( p_sub, "couldn't open .sub Vobsub file: %s", psz_vobname );
+ }
+ if( psz_vobname ) free( psz_vobname );
+
es_format_Init( &fmt, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
}
else if( p_sub->i_sub_type == SUB_TYPE_SSA1 ||
fmt.p_extra = strdup( p_sub->psz_header );
}
p_sub->p_es = es_out_Add( p_input->p_es_out, &fmt );
-
p_sub->i_previously_selected = 0;
+
return VLC_SUCCESS;
}
}
free( p_sub->subtitle );
}
+ if( p_sub->p_vobsub_file )
+ {
+ fclose( p_sub->p_vobsub_file );
+ }
}
/*****************************************************************************
char *s;
char buffer_text[MAX_LINE + 1];
- uint32_t i_start;
- uint32_t i_stop;
+ unsigned int i_start;
+ unsigned int i_stop;
unsigned int i;
for( ;; )
char *p;
char buffer_text[MAX_LINE + 1];
- uint32_t i_start, i_location;
+ unsigned int i_start, i_location;
for( ;; )
{
fprintf( stderr, "time: %x, location: %x\n", i_start, i_location );
return( 0 );
}
+/*
+
+#define mpeg_read(buf, num) _mpeg_read(srcbuf, size, srcpos, buf, num)
+static unsigned int _mpeg_read(unsigned char *srcbufunsigned int, unsigned int size,
+ unsigned int &srcpos, unsigned char *dstbuf,
+ unsigned int num) {
+ unsigned int real_num;
+
+ if ((srcpos + num) >= size)
+ real_num = size - srcpos;
+ else
+ real_num = num;
+ memcpy(dstbuf, &srcbuf[srcpos], real_num);
+ srcpos += real_num;
+
+ return real_num;
+}
+
+#define mpeg_getc() _mpeg_getch(srcbuf, size, srcpos)
+static int _mpeg_getch(unsigned char *srcbuf, unsigned int size,
+ unsigned int &srcpos) {
+ unsigned char c;
+
+ if (mpeg_read(&c, 1) != 1)
+ return -1;
+ return (int)c;
+}
+#define mpeg_seek(b, w) _mpeg_seek(size, srcpos, b, w)
+static int _mpeg_seek(unsigned int size, unsigned int &srcpos, unsigned int num,
+ int whence) {
+ unsigned int new_pos;
+
+ if (whence == SEEK_SET)
+ new_pos = num;
+ else if (whence == SEEK_CUR)
+ new_pos = srcpos + num;
+ else
+ abort();
+
+ if (new_pos >= size) {
+ srcpos = size;
+ return 1;
+ }
+
+ srcpos = new_pos;
+ return 0;
+}
+
+#define mpeg_tell() srcpos
+*/
+/*
+static int mpeg_run(demuxer_t *demuxer, unsigned char *srcbuf, unsigned int size) {
+ unsigned int len, idx, version, srcpos, packet_size;
+ int c, aid;
+ float pts;*/
+ /* Goto start of a packet, it starts with 0x000001?? */
+ /*const unsigned char wanted[] = { 0, 0, 1 };
+ unsigned char buf[5];
+ demux_packet_t *dp;
+ demux_stream_t *ds;
+ mkv_demuxer_t *mkv_d;
+
+ mkv_d = (mkv_demuxer_t *)demuxer->priv;
+ ds = demuxer->sub;
+
+ srcpos = 0;
+ packet_size = 0;
+ while (1) {
+ if (mpeg_read(buf, 4) != 4)
+ return -1;
+ while (memcmp(buf, wanted, sizeof(wanted)) != 0) {
+ c = mpeg_getc();
+ if (c < 0)
+ return -1;
+ memmove(buf, buf + 1, 3);
+ buf[3] = c;
+ }
+ switch (buf[3]) {
+ case 0xb9: */ /* System End Code */
+ /* return 0;
+ break;
+
+ case 0xba: */ /* Packet start code */
+ /* c = mpeg_getc();
+ if (c < 0)
+ return -1;
+ if ((c & 0xc0) == 0x40)
+ version = 4;
+ else if ((c & 0xf0) == 0x20)
+ version = 2;
+ else {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: Unsupported MPEG "
+ "version: 0x%02x\n", c);
+ return -1;
+ }
+
+ if (version == 4) {
+ if (mpeg_seek(9, SEEK_CUR))
+ return -1;
+ } else if (version == 2) {
+ if (mpeg_seek(7, SEEK_CUR))
+ return -1;
+ } else
+ abort();
+ break;
+
+ case 0xbd: */ /* packet */
+/* if (mpeg_read(buf, 2) != 2)
+ return -1;
+ len = buf[0] << 8 | buf[1];
+ idx = mpeg_tell();
+ c = mpeg_getc();
+ if (c < 0)
+ return -1;
+ if ((c & 0xC0) == 0x40) {*/ /* skip STD scale & size */
+/* if (mpeg_getc() < 0)
+ return -1;
+ c = mpeg_getc();
+ if (c < 0)
+ return -1;
+ }
+ if ((c & 0xf0) == 0x20) { */ /* System-1 stream timestamp */
+ /* Do we need this? */
+/* abort();
+ } else if ((c & 0xf0) == 0x30) {
+ */ /* Do we need this? */
+/* abort();
+ } else if ((c & 0xc0) == 0x80) {*/ /* System-2 (.VOB) stream */
+/* unsigned int pts_flags, hdrlen, dataidx;
+ c = mpeg_getc();
+ if (c < 0)
+ return -1;
+ pts_flags = c;
+ c = mpeg_getc();
+ if (c < 0)
+ return -1;
+ hdrlen = c;
+ dataidx = mpeg_tell() + hdrlen;
+ if (dataidx > idx + len) {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: Invalid header "
+ "length: %d (total length: %d, idx: %d, dataidx: %d)\n",
+ hdrlen, len, idx, dataidx);
+ return -1;
+ }
+ if ((pts_flags & 0xc0) == 0x80) {
+ if (mpeg_read(buf, 5) != 5)
+ return -1;
+ if (!(((buf[0] & 0xf0) == 0x20) && (buf[0] & 1) && (buf[2] & 1) &&
+ (buf[4] & 1))) {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub PTS error: 0x%02x "
+ "%02x%02x %02x%02x \n",
+ buf[0], buf[1], buf[2], buf[3], buf[4]);
+ pts = 0;
+ } else
+ pts = ((buf[0] & 0x0e) << 29 | buf[1] << 22 |
+ (buf[2] & 0xfe) << 14 | buf[3] << 7 | (buf[4] >> 1));
+ } else*/ /* if ((pts_flags & 0xc0) == 0xc0) */// {
+ /* what's this? */
+ /* abort(); */
+ /* }
+ mpeg_seek(dataidx, SEEK_SET);
+ aid = mpeg_getc();
+ if (aid < 0) {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: Bogus aid %d\n", aid);
+ return -1;
+ }
+ packet_size = len - ((unsigned int)mpeg_tell() - idx);
+
+ dp = new_demux_packet(packet_size);
+ dp->flags = 1;
+ dp->pts = mkv_d->last_pts;
+ if (mpeg_read(dp->buffer, packet_size) != packet_size) {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: mpeg_read failure");
+ packet_size = 0;
+ return -1;
+ }
+ ds_add_packet(ds, dp);
+ idx = len;
+ }
+ break;
+
+ case 0xbe: */ /* Padding */
+ /* if (mpeg_read(buf, 2) != 2)
+ return -1;
+ len = buf[0] << 8 | buf[1];
+ if ((len > 0) && mpeg_seek(len, SEEK_CUR))
+ return -1;
+ break;
+
+ default:
+ if ((0xc0 <= buf[3]) && (buf[3] < 0xf0)) {
+ */ /* MPEG audio or video */
+ /* if (mpeg_read(buf, 2) != 2)
+ return -1;
+ len = (buf[0] << 8) | buf[1];
+ if ((len > 0) && mpeg_seek(len, SEEK_CUR))
+ return -1;
+
+ }
+ else {
+ mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] VobSub: unknown header "
+ "0x%02X%02X%02X%02X\n", buf[0], buf[1], buf[2], buf[3]);
+ return -1;
+ }
+ }
+ }
+ return 0;
+}
+*/
* sub.h
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
- * $Id: sub.h,v 1.11 2003/11/13 13:31:12 fenrir Exp $
+ * $Id: sub.h,v 1.12 2004/01/25 20:05:29 hartman Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
subtitle_t *subtitle;
es_out_id_t *p_es;
int i_previously_selected; /* to make pf_seek */
+ FILE *p_vobsub_file;
/*unsigned int i_tracks;
subtitle_track_t *p_tracks
* adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: adjust.c,v 1.16 2004/01/25 03:28:32 hartman Exp $
+ * $Id: adjust.c,v 1.17 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Simon Latapie <garf@via.ecp.fr>
*
vlc_module_begin();
- add_category_hint( N_("Adjust"), NULL, VLC_FALSE );
+ set_description( _("Image properties filter") );
+ set_capability( "video filter", 0 );
+
add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, CONT_TEXT, CONT_LONGTEXT, VLC_FALSE );
add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, LUM_TEXT, LUM_LONGTEXT, VLC_FALSE );
add_integer_with_range( "hue", 0, 0, 360, NULL, HUE_TEXT, HUE_LONGTEXT, VLC_FALSE );
add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, SAT_TEXT, SAT_LONGTEXT, VLC_FALSE );
add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL, GAMMA_TEXT, GAMMA_LONGTEXT, VLC_FALSE );
- set_description( _("Image properties filter") );
- set_capability( "video filter", 0 );
+
add_shortcut( "adjust" );
set_callbacks( Create, Destroy );
vlc_module_end();
* clone.c : Clone video plugin for vlc
*****************************************************************************
* Copyright (C) 2002, 2003 VideoLAN
- * $Id: clone.c,v 1.11 2003/10/15 22:49:48 gbazin Exp $
+ * $Id: clone.c,v 1.12 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#define VOUTLIST_LONGTEXT N_("Select the specific vout modules that you want to activate")
vlc_module_begin();
- add_category_hint( N_("Clone"), NULL, VLC_FALSE );
+ set_description( _("Clone video filter") );
+ set_capability( "video filter", 0 );
+
add_integer( "clone-count", 2, NULL, COUNT_TEXT, COUNT_LONGTEXT, VLC_FALSE );
add_string ( "clone-vout-list", NULL, NULL, VOUTLIST_TEXT, VOUTLIST_LONGTEXT, VLC_FALSE );
- set_description( _("clone video filter") );
- set_capability( "video filter", 0 );
+
add_shortcut( "clone" );
set_callbacks( Create, Destroy );
vlc_module_end();
* crop.c : Crop video plugin for vlc
*****************************************************************************
* Copyright (C) 2002, 2003 VideoLAN
- * $Id: crop.c,v 1.14 2004/01/25 03:28:41 hartman Exp $
+ * $Id: crop.c,v 1.15 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
#define AUTOCROP_LONGTEXT N_("Activate automatic black border cropping.")
vlc_module_begin();
- add_category_hint( N_("Crop"), NULL, VLC_FALSE );
- add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, VLC_FALSE );
- add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, VLC_FALSE );
set_description( _("Crop video filter") );
set_capability( "video filter", 0 );
+
+ add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT, GEOMETRY_LONGTEXT, VLC_FALSE );
+ add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT, AUTOCROP_LONGTEXT, VLC_FALSE );
+
add_shortcut( "crop" );
set_callbacks( Create, Destroy );
vlc_module_end();
* deinterlace.c : deinterlacer plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: deinterlace.c,v 1.19 2004/01/23 15:36:23 titer Exp $
+ * $Id: deinterlace.c,v 1.20 2004/01/25 20:05:28 hartman Exp $
*
* Author: Sam Hocevar <sam@zoy.org>
*
#define MODE_LONGTEXT N_("You can choose the default deinterlace mode")
static char *mode_list[] = { "discard", "blend", "mean", "bob", "linear" };
-static char *mode_list_text[] = { N_("discard"), N_("Blend"), N_("Mean"),
+static char *mode_list_text[] = { N_("Discard"), N_("Blend"), N_("Mean"),
N_("Bob"), N_("Linear") };
vlc_module_begin();
- add_category_hint( N_("Deinterlace"), NULL, VLC_FALSE );
+ set_description( _("Deinterlacing video filter") );
+ set_capability( "video filter", 0 );
+
add_string( "deinterlace-mode", "discard", NULL, MODE_TEXT,
MODE_LONGTEXT, VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 );
- set_description( _("video deinterlacing filter") );
- set_capability( "video filter", 0 );
+
add_shortcut( "deinterlace" );
set_callbacks( Create, Destroy );
vlc_module_end();
* distort.c : Misc video effects plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: distort.c,v 1.13 2004/01/25 03:28:41 hartman Exp $
+ * $Id: distort.c,v 1.14 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
static char *mode_list_text[] = { N_("Wave"), N_("Ripple") };
vlc_module_begin();
- add_category_hint( N_("Distort"), NULL, VLC_FALSE );
+ set_description( _("Distort video filter") );
+ set_capability( "video filter", 0 );
+
add_string( "distort-mode", "wave", NULL, MODE_TEXT, MODE_LONGTEXT,
VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 );
- set_description( _("Distort video filter") );
- set_capability( "video filter", 0 );
+
add_shortcut( "distort" );
set_callbacks( Create, Destroy );
vlc_module_end();
* logo.c : logo video plugin for vlc
*****************************************************************************
* Copyright (C) 2003-2004 VideoLAN
- * $Id: logo.c,v 1.9 2004/01/25 15:55:37 sigmunau Exp $
+ * $Id: logo.c,v 1.10 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Simon Latapie <garf@videolan.org>
*
#define TRANS_LONGTEXT N_("You can change it by middle-clicking and moving mouse left or right")
vlc_module_begin();
- add_category_hint( N_("logo"), NULL, VLC_FALSE );
+ set_description( _("Logo video filter") );
+ set_capability( "video filter", 0 );
+
add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
add_integer( "logo-x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
add_integer( "logo-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
- add_integer_with_range( "logo-transparency", 255, 0, 255, NULL, TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
- set_description( _("Logo video filter") );
- set_capability( "video filter", 0 );
+ add_integer_with_range( "logo-transparency", 255, 0, 255, NULL,
+ TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
+
add_shortcut( "logo" );
set_callbacks( Create, Destroy );
vlc_module_end();
* motion_blur.c : motion blur filter for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: motionblur.c,v 1.14 2004/01/25 03:28:41 hartman Exp $
+ * $Id: motionblur.c,v 1.15 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
#define MODE_LONGTEXT N_("The degree of blurring from 1 to 127")
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
- add_integer_with_range( "blur-factor", 80, 1, 127, NULL, MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
set_description( _("Motion blur filter") );
set_capability( "video filter", 0 );
+
+ add_integer_with_range( "blur-factor", 80, 1, 127, NULL,
+ MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
+
set_callbacks( Create, Destroy );
vlc_module_end();
* transform.c : transform image module for vlc
*****************************************************************************
* Copyright (C) 2000-2004 VideoLAN
- * $Id: transform.c,v 1.17 2004/01/25 03:28:41 hartman Exp $
+ * $Id: transform.c,v 1.18 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
N_("Flip horizontally"), N_("Flip vertically") };
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
+ set_description( _("Video transformation filter") );
+ set_capability( "video filter", 0 );
+
add_string( "transform-type", "90", NULL,
TYPE_TEXT, TYPE_LONGTEXT, VLC_FALSE);
change_string_list( type_list, type_list_text, 0);
- set_description( _("Video transformation filter") );
- set_capability( "video filter", 0 );
+
add_shortcut( "transform" );
set_callbacks( Create, Destroy );
vlc_module_end();
* wall.c : Wall video plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: wall.c,v 1.12 2004/01/25 03:28:41 hartman Exp $
+ * $Id: wall.c,v 1.13 2004/01/25 20:05:28 hartman Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
"defaults to all")
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL, VLC_FALSE );
+ set_description( _("wall video filter") );
+ set_capability( "video filter", 0 );
+
add_integer( "wall-cols", 3, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE );
add_integer( "wall-rows", 3, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE );
add_string( "wall-active", NULL, NULL, ACTIVE_TEXT, ACTIVE_LONGTEXT, VLC_FALSE );
- set_description( _("wall video filter") );
- set_capability( "video filter", 0 );
+
add_shortcut( "wall" );
set_callbacks( Create, Destroy );
vlc_module_end();
projects / vlc / commitdiff