Commit 42195685 authored by Sam Hocevar's avatar Sam Hocevar

* toolbox:

    + Added pda.glade to the list of Glade2 generated files.
    + Remove strings such as "http://" or "/dev/video0" from the list of
      translated strings in the PDA interface.
  * Fixed grammar, spelling, a few pathetic inconsistencies, removed trailing
    whitespaces and tabulations here and there.
parent 6bfbdea9
......@@ -2,7 +2,7 @@
* vlc_help.h: Help strings
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlc_help.h,v 1.5 2003/12/03 12:33:21 sam Exp $
* $Id: vlc_help.h,v 1.6 2003/12/22 02:24:53 sam Exp $
*
* Authors: Clément Stenac <zorglub@videolan.org>
* Anil Daoud <anil@videolan.org>
......@@ -29,13 +29,13 @@
* First, we need help strings for the General Settings and for the
* Plugins screen
*/
#define GENERAL_TITLE N_( "VLC Preferences" )
#define GENERAL_TITLE N_( "VLC preferences" )
#define GENERAL_HELP N_( \
"Configure some global options in General Settings " \
"and configure each VLC plugin in the Plugins section.\n" \
"Click on \"Advanced Options\" to see all options." )
#define PLUGIN_TITLE N_( "VLC Plugins Preferences" )
#define PLUGIN_TITLE N_( "VLC plugins preferences" )
#define PLUGIN_HELP N_( \
"In this tree, you can set options for every plugin used by VLC.\n" \
"Plugins are sorted by type.\nHave fun tuning VLC!" )
......@@ -62,7 +62,7 @@
#define AOUT_ENC_HELP N_("These are general settings for audio encoding modules.")
#define CHROMA_TITLE N_("Chroma modules settings")
#define CHROMA_HELP N_(" ")
#define CHROMA_HELP N_("These settings affect chroma transformation modules.")
#define DECODER_TITLE N_("Decoder modules settings" )
#define DECODER_HELP N_( \
......@@ -70,7 +70,7 @@
"preferred subtitles.")
#define DEMUX_TITLE N_("Demuxers settings")
#define DEMUX_HELP N_( " ")
#define DEMUX_HELP N_( "These settings affect demuxer modules.")
#define INTERFACE_TITLE N_("Interface plugins settings")
#define INTERFACE_HELP N_( \
......
......@@ -2,7 +2,7 @@
* cdda.c : CD digital audio input module for vlc
*****************************************************************************
* Copyright (C) 2000, 2003 VideoLAN
* $Id: cdda.c,v 1.10 2003/12/11 05:30:11 rocky Exp $
* $Id: cdda.c,v 1.11 2003/12/22 02:24:51 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
......@@ -44,17 +44,17 @@ static void DemuxClose ( vlc_object_t * );
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for cdda streams. This " \
"value should be set in miliseconds units." )
"value should be set in milliseconds units." )
vlc_module_begin();
set_description( _("CD Audio input") );
set_description( _("Audio CD input") );
set_capability( "access", 70 );
add_integer( "cdda-caching", DEFAULT_PTS_DELAY / 1000, NULL, CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
set_callbacks( AccessOpen, AccessClose );
add_shortcut( "cdda" );
add_submodule();
set_description( _("CD Audio demux") );
set_description( _("Audio CD demux") );
set_capability( "demux", 0 );
set_callbacks( DemuxOpen, DemuxClose );
add_shortcut( "cdda" );
......
......@@ -2,9 +2,9 @@
* cddax.c : CD digital audio input module for vlc using libcdio
*****************************************************************************
* Copyright (C) 2000,2003 VideoLAN
* $Id: cdda.c,v 1.14 2003/12/20 11:56:56 rocky Exp $
* $Id: cdda.c,v 1.15 2003/12/22 02:24:51 sam Exp $
*
* Authors: Rocky Bernstein <rocky@panix.com>
* Authors: Rocky Bernstein <rocky@panix.com>
* Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -42,12 +42,12 @@ int E_(DemuxOpen) ( vlc_object_t * p_this);
void E_(DemuxClose) ( vlc_object_t * p_this);
int E_(DebugCB) ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
vlc_value_t oldval, vlc_value_t val,
void *p_data );
int E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
vlc_value_t oldval, vlc_value_t val,
void *p_data );
/*****************************************************************************
* Module descriptor
......@@ -116,78 +116,78 @@ vlc_module_begin();
/* Configuration options */
add_category_hint( N_("CDX"), NULL, VLC_TRUE );
add_integer ( MODULE_STRING "-debug", 0, E_(DebugCB),
N_("set debug mask for additional debugging."),
add_integer ( MODULE_STRING "-debug", 0, E_(DebugCB),
N_("set debug mask for additional debugging."),
DEBUG_LONGTEXT, VLC_TRUE );
add_integer( MODULE_STRING "-caching",
DEFAULT_PTS_DELAY / 1000, NULL,
N_("Caching value in ms"),
CACHING_LONGTEXT, VLC_TRUE );
add_integer( MODULE_STRING "-caching",
DEFAULT_PTS_DELAY / 1000, NULL,
N_("Caching value in ms"),
CACHING_LONGTEXT, VLC_TRUE );
add_string( MODULE_STRING "-author-format",
"%A - %a %C %I", NULL,
N_("Format to use in playlist 'author' field"),
add_string( MODULE_STRING "-author-format",
"%A - %a %C %I", NULL,
N_("Format to use in playlist \"author\" field"),
TITLE_FMT_LONGTEXT, VLC_TRUE );
add_string( MODULE_STRING "-title-format",
"%T %M", NULL,
N_("Format to use in playlist 'title' field when no CDDB"),
add_string( MODULE_STRING "-title-format",
"%T %M", NULL,
N_("Format to use in playlist \"title\" field when no CDDB"),
TITLE_FMT_LONGTEXT, VLC_TRUE );
#ifdef HAVE_LIBCDDB
add_string( MODULE_STRING "-cddb-title-format",
"Track %T. %t - %p", NULL,
N_("Format to use in playlist 'title' field when using CDDB"),
add_string( MODULE_STRING "-cddb-title-format",
"Track %T. %t - %p", NULL,
N_("Format to use in playlist \"title\" field when using CDDB"),
CDDB_TITLE_FMT_LONGTEXT, VLC_TRUE );
add_bool( MODULE_STRING "-cddb-enabled", 1, E_(CDDBEnabledCB),
N_("Do CDDB lookups?"),
N_("If set, lookup CD-DA track information using the CDDB "
"protocol"),
VLC_FALSE );
add_string( MODULE_STRING "-cddb-server", "freedb.freedb.org", NULL,
N_("CDDB server"),
N_( "Contact this CDDB server look up CD-DA information"),
VLC_TRUE );
add_integer( MODULE_STRING "-cddb-port", 8880, NULL,
N_("CDDB server port"),
N_("CDDB server uses this port number to communicate on"),
VLC_TRUE );
add_string( MODULE_STRING "-cddb-email", "me@home", NULL,
N_("email address reported to CDDB server"),
N_("email address reported to CDDB server"),
VLC_TRUE );
N_("Do CDDB lookups?"),
N_("If set, lookup CD-DA track information using the CDDB "
"protocol"),
VLC_FALSE );
add_string( MODULE_STRING "-cddb-server", "freedb.freedb.org", NULL,
N_("CDDB server"),
N_( "Contact this CDDB server look up CD-DA information"),
VLC_TRUE );
add_integer( MODULE_STRING "-cddb-port", 8880, NULL,
N_("CDDB server port"),
N_("CDDB server uses this port number to communicate on"),
VLC_TRUE );
add_string( MODULE_STRING "-cddb-email", "me@home", NULL,
N_("email address reported to CDDB server"),
N_("email address reported to CDDB server"),
VLC_TRUE );
add_bool( MODULE_STRING "-cddb-enable-cache", 1, NULL,
N_("Cache CDDB lookups?"),
N_("If set cache CDDB information about this CD"),
VLC_FALSE );
N_("Cache CDDB lookups?"),
N_("If set cache CDDB information about this CD"),
VLC_FALSE );
add_bool( MODULE_STRING "-cddb-httpd", 0, NULL,
N_("Contact CDDB via the HTTP protocol?"),
N_("If set, the CDDB server gets information via the CDDB HTTP "
"protocol"),
VLC_TRUE );
add_integer( MODULE_STRING "-cddb-timeout", 10, NULL,
N_("CDDB server timeout"),
N_("Time (in seconds) to wait for a response from the "
"CDDB server"),
VLC_FALSE );
add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL,
N_("Directory to cache CDDB requests"),
N_("Directory to cache CDDB requests"),
VLC_TRUE );
N_("Contact CDDB via the HTTP protocol?"),
N_("If set, the CDDB server gets information via the CDDB HTTP "
"protocol"),
VLC_TRUE );
add_integer( MODULE_STRING "-cddb-timeout", 10, NULL,
N_("CDDB server timeout"),
N_("Time (in seconds) to wait for a response from the "
"CDDB server"),
VLC_FALSE );
add_string( MODULE_STRING "-cddb-cachedir", "~/.cddbslave", NULL,
N_("Directory to cache CDDB requests"),
N_("Directory to cache CDDB requests"),
VLC_TRUE );
#endif
add_submodule();
set_description( _("CD Audio demux") );
set_description( _("Audio CD demux") );
set_capability( "demux", 0 );
set_callbacks( E_(DemuxOpen), E_(DemuxClose) );
add_shortcut( "cdda" );
......
......@@ -2,9 +2,9 @@
* vcd.c : VCD input module for vlc
*****************************************************************************
* Copyright (C) 2000,2003 VideoLAN
* $Id: vcd.c,v 1.12 2003/12/13 12:56:14 rocky Exp $
* $Id: vcd.c,v 1.13 2003/12/22 02:24:51 sam Exp $
*
* Authors: Rocky Bernstein <rocky@panix.com>
* Authors: Rocky Bernstein <rocky@panix.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -42,8 +42,8 @@ int E_(InitVCD) ( vlc_object_t * );
void E_(EndVCD) ( vlc_object_t * );
int E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
vlc_value_t oldval, vlc_value_t val,
void *p_data );
vlc_value_t oldval, vlc_value_t val,
void *p_data );
/*****************************************************************************
* Option help text
......@@ -68,16 +68,16 @@ int E_(DebugCallback) ( vlc_object_t *p_this, const char *psz_name,
"Format used in the GUI Playlist Title. Similar to the Unix date \n" \
"Format specifiers that start with a percent sign. Specifiers are: \n" \
" %A : The album information\n" \
" %C : The VCD volume count - the number of CD's in the collection\n" \
" %C : The VCD volume count - the number of CDs in the collection\n" \
" %c : The VCD volume num - the number of the CD in the collection.\n" \
" %F : The VCD Format, e.g. VCD 1.0, VCD 1.1, VCD 2.0, or SVC\n" \
" %I : The current entry/segment/playback type, e.g. ENTRY, TRACK, SEGMENT..\n" \
" %L : The playlist ID prefixed with ' LID' if it exists\n" \
" %I : The current entry/segment/playback type, e.g. ENTRY, TRACK, SEGMENT...\n" \
" %L : The playlist ID prefixed with \" LID\" if it exists\n" \
" %N : The current number of the %I - a decimal number\n" \
" %P : The publisher ID\n" \
" %p : The preparer I\n" \
" %S : If we are in a segment (menu), the kind of segment\n" \
" %T : The track numbe\n" \
" %T : The track number\n" \
" %V : The volume set I\n" \
" %v : The volume I\n" \
" A number between 1 and the volume count.\n" \
......@@ -98,26 +98,26 @@ vlc_module_begin();
/* Configuration options */
add_category_hint( N_("VCDX"), NULL, VLC_TRUE );
add_integer ( MODULE_STRING "-debug", 0, E_(DebugCallback),
N_("set debug mask for additional debugging."),
add_integer ( MODULE_STRING "-debug", 0, E_(DebugCallback),
N_("set debug mask for additional debugging."),
DEBUG_LONGTEXT, VLC_TRUE );
add_bool( MODULE_STRING "-PBC", 0, NULL,
N_("Use playback control?"),
N_("If VCD is authored with playback control, use it. "
"Otherwise we play by tracks."),
VLC_TRUE );
add_string( MODULE_STRING "-author-format",
"%v - %F disc %c of %C",
NULL,
N_("Format to use in playlist 'author'"),
N_("Use playback control?"),
N_("If VCD is authored with playback control, use it. "
"Otherwise we play by tracks."),
VLC_TRUE );
add_string( MODULE_STRING "-author-format",
"%v - %F disc %c of %C",
NULL,
N_("Format to use in playlist \"author\""),
VCD_TITLE_FMT_LONGTEXT, VLC_TRUE );
add_string( MODULE_STRING "-title-format",
"%I %N%L%S - %M",
NULL,
N_("Format to use in playlist 'title' field"),
add_string( MODULE_STRING "-title-format",
"%I %N%L%S - %M",
NULL,
N_("Format to use in playlist \"title\" field"),
VCD_TITLE_FMT_LONGTEXT, VLC_TRUE );
#ifdef FIXED
......
......@@ -2,7 +2,7 @@
* postprocessing.c
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: postprocessing.c,v 1.4 2003/10/25 00:49:13 sam Exp $
* $Id: postprocessing.c,v 1.5 2003/12/22 02:24:51 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -46,16 +46,16 @@ static int pp_postprocess( picture_t *,
*****************************************************************************/
vlc_module_begin();
#ifdef MODULE_NAME_IS_postprocessing_c
set_description( _("C Post Processing") );
set_description( _("C post processing") );
set_capability( "postprocessing", 50 );
add_shortcut( "c" );
#elif defined( MODULE_NAME_IS_postprocessing_mmx )
set_description( _("MMX Post Processing") );
set_description( _("MMX post processing") );
set_capability( "postprocessing", 100 );
add_requirement( MMX );
add_shortcut( "mmx" );
#elif defined( MODULE_NAME_IS_postprocessing_mmxext )
set_description( _("MMXEXT Post Processing") );
set_description( _("MMXEXT post processing") );
set_capability( "postprocessing", 150 );
add_requirement( MMXEXT );
add_shortcut( "mmxext" );
......
......@@ -2,10 +2,10 @@
* ogt.c : Overlay Graphics Text (SVCD subtitles) decoder thread
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: ogt.c,v 1.2 2003/12/08 06:01:11 rocky Exp $
* $Id: ogt.c,v 1.3 2003/12/22 02:24:51 sam Exp $
*
* Authors: Rocky Bernstein
* based on code from:
* Authors: Rocky Bernstein
* based on code from:
* Julio Sanchez Fernandez (http://subhandler.sourceforge.net)
* Samuel Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir@via.ecp.fr>
......@@ -54,12 +54,12 @@ vlc_module_begin();
set_capability( "decoder", 50 );
set_callbacks( DecoderOpen, Close );
add_integer ( MODULE_STRING "-debug", 0, NULL,
N_("set debug mask for additional debugging."),
add_integer ( MODULE_STRING "-debug", 0, NULL,
N_("set debug mask for additional debugging."),
N_(DEBUG_LONGTEXT), VLC_TRUE );
add_submodule();
set_description( _("Phlips OGT (SVCD subtitle) packetizer") );
set_description( _("Philips OGT (SVCD subtitle) packetizer") );
set_capability( "packetizer", 50 );
set_callbacks( PacketizerOpen, Close );
vlc_module_end();
......@@ -81,8 +81,8 @@ static block_t *Packetize( decoder_t *, block_t ** );
Initialize so the next packet will start off a new one.
*****************************************************************************/
static void
InitSubtitleBlock( decoder_sys_t * p_sys )
static void
InitSubtitleBlock( decoder_sys_t * p_sys )
{
p_sys->i_spu_size = 0;
p_sys->state = SUBTITLE_BLOCK_EMPTY;
......@@ -98,7 +98,7 @@ InitSubtitleBlock( decoder_sys_t * p_sys )
* Tries to launch a decoder and return score so that the interface is able
* to chose.
*****************************************************************************/
static int
static int
DecoderOpen( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
......@@ -109,7 +109,7 @@ DecoderOpen( vlc_object_t *p_this )
return VLC_EGENERIC;
}
p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
p_sys->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" );
......@@ -214,7 +214,7 @@ Decode ( decoder_t *p_dec, block_t **pp_block )
vlc_object_release( p_sys->p_vout );
}
InitSubtitleBlock ( p_sys );
InitSubtitleBlock ( p_sys );
}
}
......@@ -241,34 +241,34 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
/*
The following information is mostly extracted from the SubMux package of
unknown author with additional experimentation.
The format is roughly as follows (everything is big-endian):
size description
-------------------------------------------
byte subtitle channel (0..7) in bits 0-3
byte subtitle channel (0..7) in bits 0-3
byte subtitle packet number of this subtitle image 0-N,
if the subtitle packet is complete, the top bit of the byte is 1.
u_int16 subtitle image number
u_int16 length in bytes of the rest
uint16 subtitle image number
uint16 length in bytes of the rest
byte option flags, unknown meaning except bit 3 (0x08) indicates
presence of the duration field
byte unknown
u_int32 duration in 1/90000ths of a second (optional), start time
is as indicated by the PTS in the PES header
u_int32 xpos
u_int32 ypos
u_int32 width (must be even)
u_int32 height (must be even)
presence of the duration field
byte unknown
uint32 duration in 1/90000ths of a second (optional), start time
is as indicated by the PTS in the PES header
uint32 xpos
uint32 ypos
uint32 width (must be even)
uint32 height (must be even)
byte[16] palette, 4 palette entries, each contains values for
Y, U, V and transparency, 0 standing for transparent
Y, U, V and transparency, 0 standing for transparent
byte command,
cmd>>6==1 indicates shift
(cmd>>4)&3 is direction from, (0=top,1=left,2=right,3=bottom)
u_int32 shift duration in 1/90000ths of a second
u_int16 offset of odd field (subtitle image is presented interlaced)
cmd>>6==1 indicates shift
(cmd>>4)&3 is direction from, (0=top,1=left,2=right,3=bottom)
uint32 shift duration in 1/90000ths of a second
uint16 offset of odd field (subtitle image is presented interlaced)
byte[] bit image
The image is encoded using two bits per pixel that select a palette
entry except that value 00 starts a limited rle. When 00 is seen,
the next two bits (00-11) encode the number of pixels (1-4, add one to
......@@ -279,22 +279,22 @@ static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
the end.
*/
/* FIXME: do we really need p_buffer and p?
Can't all of thes _offset's and _lengths's get removed?
/* FIXME: do we really need p_buffer and p?
Can't all of thes _offset's and _lengths's get removed?
*/
static void
ParseHeader( decoder_t *p_dec, uint8_t *p_buffer, block_t *p_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
u_int8_t *p = p_buffer;
uint8_t *p = p_buffer;
int i;
p_sys->i_pts = p_block->i_pts;
p_sys->i_spu_size = GETINT16(p);
p_sys->i_options = *p++;
p_sys->i_options2 = *p++;
if ( p_sys->i_options & 0x08 ) {
p_sys->i_duration = GETINT32(p);
} else {
......@@ -305,14 +305,14 @@ ParseHeader( decoder_t *p_dec, uint8_t *p_buffer, block_t *p_block )
p_sys->i_y_start= GETINT16(p);
p_sys->i_width = GETINT16(p);
p_sys->i_height = GETINT16(p);
for (i=0; i<4; i++) {
p_sys->pi_palette[i].y = *p++;
p_sys->pi_palette[i].u = *p++;
p_sys->pi_palette[i].v = *p++;
/* We have just 4-bit resolution for alpha, but the value for SVCD
* has 8 bits so we scale down the values to the acceptable range */
p_sys->pi_palette[i].t = (*p++) >> 4;
p_sys->pi_palette[i].t = (*p++) >> 4;
}
p_sys->i_cmd = *p++;
/* We do not really know this, FIXME */
......@@ -330,25 +330,25 @@ ParseHeader( decoder_t *p_dec, uint8_t *p_buffer, block_t *p_block )
p_sys->comp_image_length =
p_sys->subtitle_data_length - p_sys->comp_image_offset;
p_sys->metadata_length = p_sys->comp_image_offset;
/*spuogt_init_subtitle_data(p_sys);*/
p_sys->subtitle_data_pos = 0;
dbg_print( (DECODE_DBG_PACKET),
"x-start: %d, y-start: %d, width: %d, height %d, "
"spu size: %d, duration: %u",
p_sys->i_x_start, p_sys->i_y_start,
p_sys->i_width, p_sys->i_height,
p_sys->i_spu_size, p_sys->i_duration );
dbg_print( (DECODE_DBG_PACKET),
"x-start: %d, y-start: %d, width: %d, height %d, "
"spu size: %d, duration: %u",
p_sys->i_x_start, p_sys->i_y_start,
p_sys->i_width, p_sys->i_height,
p_sys->i_spu_size, p_sys->i_duration );
}
#define SPU_HEADER_LEN 5
#define SPU_HEADER_LEN 5
/*****************************************************************************
Reassemble:
The data for single screen subtitle may come in one of many
non-contiguous packets of a stream. This routine is called when the
next packet in the stream comes in. The job of this routine is to
......@@ -363,10 +363,10 @@ ParseHeader( decoder_t *p_dec, uint8_t *p_buffer, block_t *p_block )
size description
-------------------------------------------
byte subtitle channel (0..7) in bits 0-3
byte subtitle channel (0..7) in bits 0-3
byte subtitle packet number of this subtitle image 0-N,
if the subtitle packet is complete, the top bit of the byte is 1.
u_int16 subtitle image number
uint16 subtitle image number
*****************************************************************************/
static block_t *
......@@ -375,8 +375,8 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
uint8_t *p_buffer;
u_int16_t i_expected_image;
u_int8_t i_packet, i_expected_packet;
uint16_t i_expected_image;
uint8_t i_packet, i_expected_packet;
if( pp_block == NULL || *pp_block == NULL )
{
......@@ -388,16 +388,16 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
if( p_block->i_buffer < SPU_HEADER_LEN )
{
msg_Dbg( p_dec, "invalid packet header (size %d < %d)" ,
p_block->i_buffer, SPU_HEADER_LEN );
p_block->i_buffer, SPU_HEADER_LEN );
block_Release( p_block );
return NULL;
}
p_buffer = p_block->p_buffer;
dbg_print( (DECODE_DBG_CALL|DECODE_DBG_PACKET),
"header: 0x%02x 0x%02x 0x%02x 0x%02x\n",
p_buffer[1], p_buffer[2], p_buffer[3], p_buffer[4] );
dbg_print( (DECODE_DBG_CALL|DECODE_DBG_PACKET),
"header: 0x%02x 0x%02x 0x%02x 0x%02x\n",
p_buffer[1], p_buffer[2], p_buffer[3], p_buffer[4] );
if ( p_sys->state == SUBTITLE_BLOCK_EMPTY ) {
......@@ -422,12 +422,12 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
if ( p_sys->i_image != i_expected_image ) {
msg_Warn( p_dec, "expecting subtitle image %u but found %u\n",
i_expected_image, p_sys->i_image );
i_expected_image, p_sys->i_image );
}
if ( i_packet != i_expected_packet ) {
msg_Warn( p_dec, "expecting subtitle image packet %u but found %u",
i_expected_packet, i_packet);
i_expected_packet, i_packet);
}
p_sys->i_packet = i_packet;
......@@ -436,21 +436,21 @@ Reassemble( decoder_t *p_dec, block_t **pp_block )
/* First packet in the subtitle block */
ParseHeader( p_dec, p_buffer, p_block );
}
block_ChainAppend( &p_sys->p_block, p_block );
p_sys->i_spu += p_block->i_buffer - SPU_HEADER_LEN;
if (p_sys->state == SUBTITLE_BLOCK_COMPLETE)
if (p_sys->state == SUBTITLE_BLOCK_COMPLETE)
{
if( p_sys->i_spu != p_sys->i_spu_size )
{
msg_Warn( p_dec, "SPU packets size=%d should be %d",
p_sys->i_spu, p_sys->i_spu_size );
}
dbg_print( (DECODE_DBG_PACKET),
"subtitle packet complete, size=%d", p_sys->i_spu );
{
msg_Warn( p_dec, "SPU packets size=%d should be %d",
p_sys->i_spu, p_sys->i_spu_size );
}
dbg_print( (DECODE_DBG_PACKET),
"subtitle packet complete, size=%d", p_sys->i_spu );
return p_sys->p_block;
}
return NULL;
......
......@@ -2,7 +2,7 @@
* rawvideo.c: Pseudo video decoder/packetizer for raw video data
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: rawvideo.c,v 1.9 2003/11/22 23:39:14 fenrir Exp $
* $Id: rawvideo.c,v 1.10 2003/12/22 02:24:51 sam Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
......@@ -63,12 +63,12 @@ static block_t *SendFrame ( decoder_t *, block_t * );
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("Pseudo Raw Video decoder") );
set_description( _("Pseudo raw video decoder") );
set_capability( "decoder", 50 );
set_callbacks( OpenDecoder, CloseDecoder );
add_submodule();
set_description( _("Pseudo Raw Video packetizer") );
set_description( _("Pseudo raw video packetizer") );
set_capability( "packetizer", 100 );
set_callbacks( OpenPacketizer, CloseDecoder );
vlc_module_end();
......
......@@ -2,7 +2,7 @@
* speex.c: speex decoder/packetizer/encoder module making use of libspeex.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: speex.c,v 1.7 2003/12/04 23:15:01 gbazin Exp $