Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
fea7f383
Commit
fea7f383
authored
Jan 25, 2004
by
bigben
Browse files
string review
still some printfs in dvbsub.c. Would need to spend some time reading the code to remove them.
parent
5bc156ab
Changes
19
Hide whitespace changes
Inline
Side-by-side
modules/codec/adpcm.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* adpcm.c : adpcm variant audio decoder
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
* $Id: adpcm.c,v 1.1
8
200
3/11/23 04:58:00 fenrir
Exp $
* $Id: adpcm.c,v 1.1
9
200
4/01/25 18:20:12 bigben
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -182,7 +182,7 @@ static int OpenDecoder( vlc_object_t *p_this )
{
p_sys
->
i_block
=
(
p_sys
->
codec
==
ADPCM_IMA_QT
)
?
34
*
p_dec
->
fmt_in
.
audio
.
i_channels
:
1024
;
msg_Warn
(
p_dec
,
"block size undefined,
->
using %d"
,
p_sys
->
i_block
);
msg_Warn
(
p_dec
,
"block size undefined, using %d"
,
p_sys
->
i_block
);
}
else
{
...
...
@@ -217,7 +217,7 @@ static int OpenDecoder( vlc_object_t *p_this )
}
msg_Dbg
(
p_dec
,
"format: samplerate:%dHz channels:%d bits/sample:%d "
"blockalign:%d samplesperblock
%d"
,
"blockalign:%d samplesperblock
:
%d"
,
p_dec
->
fmt_in
.
audio
.
i_rate
,
p_dec
->
fmt_in
.
audio
.
i_channels
,
p_dec
->
fmt_in
.
audio
.
i_bitspersample
,
p_sys
->
i_block
,
p_sys
->
i_samplesperblock
);
...
...
modules/codec/dts.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* dts.c: parse DTS audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dts.c,v 1.1
0
2004/01/2
1
1
7:56:05 gbazi
n Exp $
* $Id: dts.c,v 1.1
1
2004/01/2
5
1
8:20:12 bigbe
n Exp $
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -261,7 +261,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
SyncCode
(
p_header
)
!=
VLC_SUCCESS
)
{
msg_Dbg
(
p_dec
,
"emulated sync word "
"(no sync on following frame) %2.2x%2.2x%2.2x%2.2x"
,
"(no sync on following frame)
:
%2.2x%2.2x%2.2x%2.2x"
,
(
int
)
p_header
[
0
],
(
int
)
p_header
[
1
],
(
int
)
p_header
[
2
],
(
int
)
p_header
[
3
]
);
p_sys
->
i_state
=
STATE_NOSYNC
;
...
...
modules/codec/dv.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* dv.c: a decoder for DV video
*****************************************************************************
* Copyright (C) 2002 VideoLAN
* $Id: dv.c,v 1.
6
200
3/11/16 21:07:30 gbazi
n Exp $
* $Id: dv.c,v 1.
7
200
4/01/25 18:20:12 bigbe
n Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
*
...
...
@@ -94,7 +94,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
p_decoder
=
dv_decoder_new
(
TRUE
,
FALSE
,
FALSE
);
if
(
!
p_decoder
)
{
msg_Err
(
p_fifo
,
"cannot
create
DV decoder"
);
msg_Err
(
p_fifo
,
"cannot
start
DV decoder"
);
free
(
p_buffer
);
p_fifo
->
b_error
=
1
;
DecoderError
(
p_fifo
);
...
...
@@ -103,7 +103,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
if
(
InitBitstream
(
&
bit_stream
,
p_fifo
,
NULL
,
NULL
)
!=
VLC_SUCCESS
)
{
msg_Err
(
p_fifo
,
"cannot initiali
s
e bitstream"
);
msg_Err
(
p_fifo
,
"cannot initiali
z
e bitstream"
);
free
(
p_buffer
);
p_fifo
->
b_error
=
1
;
DecoderError
(
p_fifo
);
...
...
@@ -118,19 +118,19 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
/* Parsing the beginning of the stream */
if
(
dv_parse_header
(
p_decoder
,
p_buffer
)
<
0
)
{
fprintf
(
stderr
,
"parse error
\n
"
);
msg_Err
(
p_fifo
,
"parse error"
);
p_fifo
->
b_error
=
1
;
break
;
}
if
(
dv_format_wide
(
p_decoder
)
)
{
msg_Dbg
(
p_fifo
,
"aspect is 4:3"
);
msg_Dbg
(
p_fifo
,
"aspect
ratio
is 4:3"
);
i_aspect
=
VOUT_ASPECT_FACTOR
*
4
/
3
;
}
else
if
(
dv_format_normal
(
p_decoder
)
)
{
msg_Dbg
(
p_fifo
,
"aspect is 16:9"
);
msg_Dbg
(
p_fifo
,
"aspect
ratio
is 16:9"
);
i_aspect
=
VOUT_ASPECT_FACTOR
*
4
/
3
;
//16 / 9;
}
else
...
...
@@ -190,7 +190,7 @@ static int RunDecoder ( decoder_fifo_t *p_fifo )
if
(
dv_parse_header
(
p_decoder
,
p_buffer
)
>
0
)
{
fprintf
(
stderr
,
"size changed
\n
"
);
msg_Warn
(
p_fifo
,
"size changed"
);
}
if
(
p_vout
&&
(
!
p_decoder
->
prev_frame_decoded
...
...
modules/codec/dvbsub.c
View file @
fea7f383
...
...
@@ -3,7 +3,7 @@
*****************************************************************************
* Copyright (C) 2003 ANEVIA
* Copyright (C) 2003 VideoLAN
* $Id: dvbsub.c,v 1.
6
200
3/11/24 02:35:50 fenrir
Exp $
* $Id: dvbsub.c,v 1.
7
200
4/01/25 18:20:12 bigben
Exp $
*
* Authors: Damien LUCAS <damien.lucas@anevia.com>
* Laurent Aimar <fenrir@via.ecp.fr>
...
...
@@ -39,7 +39,7 @@ static void Close( vlc_object_t *p_this );
vlc_module_begin
();
add_category_hint
(
N_
(
"subtitles"
),
NULL
,
VLC_TRUE
);
set_description
(
_
(
"subtitles decoder"
)
);
set_description
(
_
(
"
DVB
subtitles decoder"
)
);
set_capability
(
"decoder"
,
50
);
set_callbacks
(
Open
,
Close
);
vlc_module_end
();
...
...
@@ -468,7 +468,7 @@ static void dvbsub_decode_segment( dvbsub_all_t *p_dvbspu, bs_t *s )
break
;
case
DVBSUB_ST_STUFFING
:
default:
fprintf
(
stderr
,
"
***
DVBSUB - Unsupported segment type
!
(%04x)"
,
fprintf
(
stderr
,
"DVBSUB - Unsupported segment type
:
(%04x)"
,
i_type
);
bs_skip
(
s
,
8
*
(
2
+
i_size
)
);
break
;
...
...
@@ -615,7 +615,7 @@ static void dvbsub_decode_page_composition( dvbsub_all_t *p_dvbsub, bs_t *s )
/* /Special workaround */
p_dvbsub
->
p_page
->
regions
=
trox_malloc
(
p_dvbsub
->
p_page
->
i_regions_number
*
sizeof
(
dvbsub_region_t
));
0
trox_malloc
(
p_dvbsub
->
p_page
->
i_regions_number
*
sizeof
(
dvbsub_region_t
));
for
(
i
=
0
;
i
<
p_dvbsub
->
p_page
->
i_regions_number
;
i
++
)
{
p_dvbsub
->
p_page
->
regions
[
i
].
i_id
=
bs_read
(
s
,
8
);
...
...
@@ -652,14 +652,14 @@ static void dvbsub_decode_region_composition( dvbsub_all_t *p_dvbsub, bs_t *s )
/* TODO
* The region has never been declared before
* Internal error */
fprintf
(
stderr
,
"Decoding of undeclared region N/A
...
\n
"
);
fprintf
(
stderr
,
"Decoding of undeclared region N/A
\n
"
);
return
;
}
/* Skip version number and fill flag */
if
(
bs_show
(
s
,
4
)
==
p_region
->
i_version_number
)
{
fprintf
(
stderr
,
"Skipping already known region N/A
...
\n
"
);
fprintf
(
stderr
,
"Skipping already known region N/A
\n
"
);
/* TODO Skip the right number of bits */
}
...
...
@@ -1173,14 +1173,14 @@ static void dvbsub_RenderDVBSUB( vout_thread_t *p_vout, picture_t *p_pic,
/* RV16 target, scaling */
case
VLC_FOURCC
(
'R'
,
'V'
,
'1'
,
'6'
):
fprintf
(
stderr
,
"Not
implemented chroma
!
RV16
)
\n
"
);
msg_Err
(
p_vout
,
_
(
"un
implemented chroma
:
RV16"
)
);
/* RenderRV16( p_vout, p_pic, p_spu ); */
break
;
/* RV32 target, scaling */
case
VLC_FOURCC
(
'R'
,
'V'
,
'2'
,
'4'
):
case
VLC_FOURCC
(
'R'
,
'V'
,
'3'
,
'2'
):
fprintf
(
stderr
,
"Not
implemented chroma
!
RV32
\n
"
);
msg_Err
(
p_vout
,
_
(
"un
implemented chroma
:
RV32"
)
);
/* RenderRV32( p_vout, p_pic, p_spu ); */
break
;
...
...
@@ -1229,7 +1229,7 @@ static void dvbsub_render( dvbsub_all_t *dvbsub, vout_thread_t *p_vout )
if
(
p_object
==
NULL
)
{
fprintf
(
stderr
,
"I
nternal DvbSub decoder error
\n
"
);
msg_Err
(
p_vout
,
_
(
"i
nternal DvbSub decoder error"
)
);
return
;
}
...
...
@@ -1266,7 +1266,7 @@ static void dvbsub_render( dvbsub_all_t *dvbsub, vout_thread_t *p_vout )
dvbsub
->
p_spu
[
j
]
=
vout_CreateSubPicture
(
p_vout
,
MEMORY_SUBPICTURE
);
if
(
dvbsub
->
p_spu
[
j
]
==
NULL
)
{
fprintf
(
stderr
,
"Unable to allocate memory
...
skipping
\n
"
);
msg_Err
(
p_vout
,
"Unable to allocate memory
,
skipping"
);
return
;
}
/* Set the pf_render callback */
...
...
modules/codec/faad.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* decoder.c: AAC decoder using libfaad2
*****************************************************************************
* Copyright (C) 2001, 2003 VideoLAN
* $Id: faad.c,v 1.
8
200
3/12/12 23:15:40 gbazi
n Exp $
* $Id: faad.c,v 1.
9
200
4/01/25 18:20:12 bigbe
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -108,7 +108,7 @@ static int Open( vlc_object_t *p_this )
/* Open a faad context */
if
(
(
p_sys
->
hfaad
=
faacDecOpen
()
)
==
NULL
)
{
msg_Err
(
p_dec
,
"
C
annot initialize faad"
);
msg_Err
(
p_dec
,
"
c
annot initialize faad"
);
return
VLC_EGENERIC
;
}
...
...
@@ -259,7 +259,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
frame
.
samples
<=
0
)
{
msg_Warn
(
p_dec
,
"decoded zero sample
s
"
);
msg_Warn
(
p_dec
,
"decoded zero sample"
);
/* Flush the buffer */
p_sys
->
i_buffer
-=
frame
.
bytesconsumed
;
...
...
modules/codec/ffmpeg/ffmpeg.h
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* ffmpeg.h: decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ffmpeg.h,v 1.3
1
2004/01/
08 00:12:50 gbazi
n Exp $
* $Id: ffmpeg.h,v 1.3
2
2004/01/
25 18:20:12 bigbe
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -80,7 +80,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
#define ERROR_TEXT N_("Error resilience")
#define ERROR_LONGTEXT N_( \
"ffmpeg can make error
s
resiliences. \n" \
"ffmpeg can make error resiliences. \n" \
"Nevertheless, with a buggy encoder (like ISO MPEG-4 encoder from M$) " \
"this will produce a lot of errors.\n" \
"Valid range is -1 to 99 (-1 disables all errors resiliences).")
...
...
@@ -103,7 +103,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
"but it can produce distorted pictures.")
#define TRUNC_TEXT N_("Truncated stream")
#define TRUNC_LONGTEXT N_("
t
runcated stream -1:auto,0:disable,:1:enable")
#define TRUNC_LONGTEXT N_("
T
runcated stream -1:auto,0:disable,:1:enable")
#define PP_Q_TEXT N_("Post processing quality")
#define PP_Q_LONGTEXT N_( \
...
...
@@ -111,7 +111,7 @@ void E_(ClosePostproc)( decoder_t *, void * );
"Higher levels require considerable more CPU power, but produce " \
"better looking pictures." )
#define LIBAVCODEC_PP_TEXT N_("
F
fmpeg postproc filter chains")
#define LIBAVCODEC_PP_TEXT N_("
f
fmpeg postproc filter chains")
/* FIXME (cut/past from ffmpeg */
#define LIBAVCODEC_PP_LONGTEXT \
"<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...\n" \
...
...
modules/codec/ffmpeg/postprocess.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* postprocess.c: video postprocessing using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: postprocess.c,v 1.
6
200
3/11/26 08:18:09 gbazi
n Exp $
* $Id: postprocess.c,v 1.
7
200
4/01/25 18:20:12 bigbe
n Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
...
...
@@ -234,7 +234,7 @@ static int PPQCallback( vlc_object_t *p_this, char const *psz_cmd,
if
(
!
pp_mode
)
{
msg_Err
(
p_dec
,
"failed geting mode for postproc"
);
msg_Err
(
p_dec
,
"failed get
t
ing mode for postproc"
);
newval
.
i_int
=
0
;
}
else
...
...
modules/codec/flac.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* flac.c: flac decoder/packetizer/encoder module making use of libflac
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: flac.c,v 1.
6
200
3/12/04 22:37:02 gbazi
n Exp $
* $Id: flac.c,v 1.
7
200
4/01/25 18:20:12 bigbe
n Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Sigmund Augdal <sigmunau@idi.ntnu.no>
...
...
@@ -523,7 +523,7 @@ static void DecoderMetadataCallback( const FLAC__StreamDecoder *decoder,
p_dec
->
fmt_out
.
i_codec
=
AOUT_FMT_S16_NE
;
break
;
default:
msg_Dbg
(
p_dec
,
"strange b
ps
%d"
,
msg_Dbg
(
p_dec
,
"strange b
it/sample value:
%d"
,
metadata
->
data
.
stream_info
.
bits_per_sample
);
p_dec
->
fmt_out
.
i_codec
=
VLC_FOURCC
(
'f'
,
'i'
,
'3'
,
'2'
);
break
;
...
...
@@ -562,14 +562,14 @@ static void DecoderErrorCallback( const FLAC__StreamDecoder *decoder,
switch
(
status
)
{
case
FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC
:
msg_Err
(
p_dec
,
"
A
n error in the stream caused the decoder to "
"lo
o
se synchronization."
);
msg_Err
(
p_dec
,
"
a
n error in the stream caused the decoder to "
"lose synchronization."
);
break
;
case
FLAC__STREAM_DECODER_ERROR_STATUS_BAD_HEADER
:
msg_Err
(
p_dec
,
"
T
he decoder encountered a corrupted frame header."
);
msg_Err
(
p_dec
,
"
t
he decoder encountered a corrupted frame header."
);
break
;
case
FLAC__STREAM_DECODER_ERROR_STATUS_FRAME_CRC_MISMATCH
:
msg_Err
(
p_dec
,
"
The
frame's data did not match the CRC in the "
msg_Err
(
p_dec
,
"frame's data did not match the CRC in the "
"footer."
);
break
;
default:
...
...
@@ -617,32 +617,32 @@ static void decoder_state_error( decoder_t *p_dec,
switch
(
state
)
{
case
FLAC__STREAM_DECODER_SEARCH_FOR_METADATA
:
msg_Err
(
p_dec
,
"
T
he decoder is ready to search for metadata."
);
msg_Err
(
p_dec
,
"
t
he decoder is ready to search for metadata."
);
break
;
case
FLAC__STREAM_DECODER_READ_METADATA
:
msg_Err
(
p_dec
,
"
T
he decoder is ready to or is in the process of "
msg_Err
(
p_dec
,
"
t
he decoder is ready to or is in the process of "
"reading metadata."
);
break
;
case
FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC
:
msg_Err
(
p_dec
,
"
T
he decoder is ready to or is in the process of "
msg_Err
(
p_dec
,
"
t
he decoder is ready to or is in the process of "
"searching for the frame sync code."
);
break
;
case
FLAC__STREAM_DECODER_READ_FRAME
:
msg_Err
(
p_dec
,
"
T
he decoder is ready to or is in the process of "
msg_Err
(
p_dec
,
"
t
he decoder is ready to or is in the process of "
"reading a frame."
);
break
;
case
FLAC__STREAM_DECODER_END_OF_STREAM
:
msg_Err
(
p_dec
,
"
T
he decoder has reached the end of the stream."
);
msg_Err
(
p_dec
,
"
t
he decoder has reached the end of the stream."
);
break
;
case
FLAC__STREAM_DECODER_ABORTED
:
msg_Err
(
p_dec
,
"
T
he decoder was aborted by the read callback."
);
msg_Err
(
p_dec
,
"
t
he decoder was aborted by the read callback."
);
break
;
case
FLAC__STREAM_DECODER_UNPARSEABLE_STREAM
:
msg_Err
(
p_dec
,
"
T
he decoder encountered reserved fields in use "
msg_Err
(
p_dec
,
"
t
he decoder encountered reserved fields in use "
"in the stream."
);
break
;
case
FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR
:
msg_Err
(
p_dec
,
"
An
error
occurred
allocating memory."
);
msg_Err
(
p_dec
,
"error
when
allocating memory."
);
break
;
case
FLAC__STREAM_DECODER_ALREADY_INITIALIZED
:
msg_Err
(
p_dec
,
"FLAC__stream_decoder_init() was called when the "
...
...
@@ -654,7 +654,7 @@ static void decoder_state_error( decoder_t *p_dec,
"all callbacks being set."
);
break
;
case
FLAC__STREAM_DECODER_UNINITIALIZED
:
msg_Err
(
p_dec
,
"
The
decoder i
s in the
uninitialized state."
);
msg_Err
(
p_dec
,
"decoder i
n
uninitialized state."
);
break
;
default:
msg_Err
(
p_dec
,
"unknown error"
);
...
...
modules/codec/lpcm.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* lpcm.c: lpcm decoder/packetizer module
*****************************************************************************
* Copyright (C) 1999-2003 VideoLAN
* $Id: lpcm.c,v 1.2
0
200
3/11/22 23:39:14 fenrir
Exp $
* $Id: lpcm.c,v 1.2
1
200
4/01/25 18:20:12 bigben
Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Henri Fallon <henri@videolan.org>
...
...
@@ -77,12 +77,12 @@ static void *DecodeFrame ( decoder_t *, block_t ** );
*****************************************************************************/
vlc_module_begin
();
set_description
(
_
(
"
l
inear PCM audio decoder"
)
);
set_description
(
_
(
"
L
inear PCM audio decoder"
)
);
set_capability
(
"decoder"
,
100
);
set_callbacks
(
OpenDecoder
,
CloseDecoder
);
add_submodule
();
set_description
(
_
(
"
l
inear PCM audio packetizer"
)
);
set_description
(
_
(
"
L
inear PCM audio packetizer"
)
);
set_capability
(
"packetizer"
,
100
);
set_callbacks
(
OpenPacketizer
,
CloseDecoder
);
...
...
modules/codec/mpeg_audio.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2001-2003 VideoLAN
* $Id: mpeg_audio.c,v 1.2
4
200
3/11/22 23:39:14 fenrir
Exp $
* $Id: mpeg_audio.c,v 1.2
5
200
4/01/25 18:20:12 bigben
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Eric Petit <titer@videolan.org>
...
...
@@ -256,7 +256,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
p_sys
->
i_frame_size
==
-
1
)
{
msg_Dbg
(
p_dec
,
"emulated start
code"
);
msg_Dbg
(
p_dec
,
"emulated startcode"
);
block_SkipByte
(
&
p_sys
->
bytestream
);
p_sys
->
i_state
=
STATE_NOSYNC
;
break
;
...
...
@@ -330,7 +330,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if
(
i_next_frame_size
==
-
1
)
{
msg_Dbg
(
p_dec
,
"emulated start
code on next frame"
);
msg_Dbg
(
p_dec
,
"emulated startcode on next frame"
);
block_SkipByte
(
&
p_sys
->
bytestream
);
p_sys
->
i_state
=
STATE_NOSYNC
;
break
;
...
...
modules/codec/ogt/cvd.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* cvd.c : CVD Subtitle decoder thread
*****************************************************************************
* Copyright (C) 2003, 2004 VideoLAN
* $Id: cvd.c,v 1.1
3
2004/01/2
3 08:36:48 rocky
Exp $
* $Id: cvd.c,v 1.1
4
2004/01/2
5 18:20:12 bigben
Exp $
*
* Authors: Rocky Bernstein
* based on code from:
...
...
@@ -48,7 +48,7 @@ vlc_module_begin();
set_callbacks
(
DecoderOpen
,
VCDSubClose
);
add_integer
(
MODULE_STRING
"-debug"
,
0
,
NULL
,
N_
(
"
s
et debug mask for additional debugging."
),
N_
(
"
S
et debug mask for additional debugging."
),
N_
(
DEBUG_LONGTEXT
),
VLC_TRUE
);
add_integer
(
MODULE_STRING
"-horizontal-correct"
,
0
,
NULL
,
...
...
modules/codec/ogt/render.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* render.c : Philips OGT and CVD (VCD Subtitle) blending routines
*****************************************************************************
* Copyright (C) 2003, 2004 VideoLAN
* $Id: render.c,v 1.2
2
2004/01/2
3
1
1:03:06 rocky
Exp $
* $Id: render.c,v 1.2
3
2004/01/2
5
1
8:20:12 bigben
Exp $
*
* Author: Rocky Bernstein <rocky@panix.com>
* based on code from:
...
...
@@ -813,7 +813,7 @@ BlendRV16( vout_thread_t *p_vout, picture_t *p_pic,
}
if
(
p_source
>=
p_src_end
)
{
msg_Err
(
p_vout
,
"
T
rying to access beyond subtitle %dx%d %d"
,
msg_Err
(
p_vout
,
"
t
rying to access beyond subtitle %dx%d %d"
,
i_x
,
i_y
/
i_yscale
,
i_height
);
return
;
}
...
...
@@ -1002,7 +1002,7 @@ BlendRV24( vout_thread_t *p_vout, picture_t *p_pic,
}
if
(
p_source
>=
p_src_end
)
{
msg_Err
(
p_vout
,
"
T
rying to access beyond subtitle %dx%d %d"
,
msg_Err
(
p_vout
,
"
t
rying to access beyond subtitle %dx%d %d"
,
i_x
,
i_y
/
i_yscale
,
i_height
);
return
;
}
...
...
@@ -1101,7 +1101,7 @@ BlendRV24( vout_thread_t *p_vout, picture_t *p_pic,
}
if
(
p_source
>=
p_src_end
)
{
msg_Err
(
p_vout
,
"
T
rying to access beyond subtitle %dx%d %d"
,
msg_Err
(
p_vout
,
"
t
rying to access beyond subtitle %dx%d %d"
,
i_x
,
i_y
/
i_yscale
,
i_height
);
return
;
}
...
...
@@ -1300,7 +1300,7 @@ BlendRV32( vout_thread_t *p_vout, picture_t *p_pic,
}
if
(
p_source
>=
p_src_end
)
{
msg_Err
(
p_vout
,
"
T
rying to access beyond subtitle %dx%d %d"
,
msg_Err
(
p_vout
,
"
t
rying to access beyond subtitle %dx%d %d"
,
i_x
,
i_y
/
i_yscale
,
i_height
);
return
;
}
...
...
@@ -1608,7 +1608,7 @@ BlendRGB2( vout_thread_t *p_vout, picture_t *p_pic,
}
if
(
p_source
>=
p_src_end
)
{
msg_Err
(
p_vout
,
"
T
rying to access beyond subtitle %dx%d %d"
,
msg_Err
(
p_vout
,
"
t
rying to access beyond subtitle %dx%d %d"
,
i_x
,
i_y
/
i_yscale
,
i_height
);
return
;
}
...
...
@@ -1661,7 +1661,7 @@ BlendRGB2( vout_thread_t *p_vout, picture_t *p_pic,
}
if
(
p_source
>=
p_src_end
)
{
msg_Err
(
p_vout
,
"
T
rying to access beyond subtitle %dx%d %d"
,
msg_Err
(
p_vout
,
"
t
rying to access beyond subtitle %dx%d %d"
,
i_x
,
i_y
/
i_yscale
,
i_height
);
return
;
}
...
...
modules/codec/ogt/subtitle.h
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* subtitle.h : Common SVCD and CVD subtitles header
*****************************************************************************
* Copyright (C) 2003,2004 VideoLAN
* $Id: subtitle.h,v 1.1
1
2004/01/2
2 04:46:19 rocky
Exp $
* $Id: subtitle.h,v 1.1
2
2004/01/2
5 18:20:12 bigben
Exp $
*
* Author: Rocky Bernstein
* based on code from:
...
...
@@ -61,7 +61,7 @@
"4:3 and 16:9 respectively." \
)
#define DURATION_SCALE_TEXT N_("
f
actor to increase subtitle display interval")
#define DURATION_SCALE_TEXT N_("
F
actor to increase subtitle display interval")
#define DURATION_SCALE_LONGTEXT N_( \
"If you find you need extra time for reading subtitles, " \
"you can set this higher and it will multiply the display " \
...
...
modules/codec/quicktime.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* quicktime.c: a quicktime decoder that uses the QT library/dll
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: quicktime.c,v 1.2
0
200
3/1
1/2
4
1
3:40:03 gbazi
n Exp $
* $Id: quicktime.c,v 1.2
1
200
4/0
1/2
5
1
8:20:12 bigbe
n Exp $
*
* Authors: Laurent Aimar <fenrir at via.ecp.fr>
* Derk-Jan Hartman <thedj at users.sf.net>
...
...
@@ -374,7 +374,7 @@ static int OpenAudio( decoder_t *p_dec )
#ifndef SYS_DARWIN
if
(
(
i_error
=
p_sys
->
InitializeQTML
(
6
+
16
)
)
)
{
msg_Dbg
(
p_dec
,
"error
while
InitializeQTML = %d"
,
i_error
);
msg_Dbg
(
p_dec
,
"error
on
InitializeQTML = %d"
,
i_error
);
goto
exit_error
;
}
#endif
...
...
@@ -405,7 +405,7 @@ static int OpenAudio( decoder_t *p_dec )
&
p_sys
->
myConverter
);
if
(
i_error
)
{
msg_Err
(
p_dec
,
"error
while
SoundConverterOpen = %d"
,
i_error
);
msg_Err
(
p_dec
,
"error
on
SoundConverterOpen = %d"
,
i_error
);
goto
exit_error
;
}
...
...
@@ -421,7 +421,7 @@ static int OpenAudio( decoder_t *p_dec )
FCC
(
'w'
,
'a'
,
'v'
,
'e'
),
((
uint8_t
*
)
p_dec
->
fmt_in
.
p_extra
)
+
36
+
8
);
msg_Dbg
(
p_dec
,
"error
while
SoundConverterSetInfo = %d"
,
i_error
);
msg_Dbg
(
p_dec
,
"error
on
SoundConverterSetInfo = %d"
,
i_error
);
}
WantedBufferSize
=
p_sys
->
OutputFormatInfo
.
numChannels
*
...
...
@@ -449,7 +449,7 @@ static int OpenAudio( decoder_t *p_dec )
if
(
(
i_error
=
p_sys
->
SoundConverterBeginConversion
(
p_sys
->
myConverter
))
)
{
msg_Err
(
p_dec
,
"error
while
SoundConverterBeginConversion = %d"
,
i_error
);
"error
on
SoundConverterBeginConversion = %d"
,
i_error
);
goto
exit_error
;
}
...
...
@@ -677,7 +677,7 @@ static int OpenVideo( decoder_t *p_dec )
#ifndef SYS_DARWIN
if
(
(
i_result
=
p_sys
->
InitializeQTML
(
6
+
16
)
)
)
{
msg_Dbg
(
p_dec
,
"error
while
InitializeQTML = %d"
,
(
int
)
i_result
);
msg_Dbg
(
p_dec
,
"error
on
InitializeQTML = %d"
,
(
int
)
i_result
);
goto
exit_error
;
}
#endif
...
...
@@ -936,7 +936,7 @@ static int QTAudioInit( decoder_t *p_dec )
if
(
p_sys
->
InitializeQTML
==
NULL
)
{
msg_Err
(
p_dec
,
"failed geting proc address InitializeQTML"
);
msg_Err
(
p_dec
,
"failed get
t
ing proc address InitializeQTML"
);
return
VLC_EGENERIC
;
}
if
(
p_sys
->
SoundConverterOpen
==
NULL
||
...
...
@@ -947,7 +947,7 @@ static int QTAudioInit( decoder_t *p_dec )
p_sys
->
SoundConverterEndConversion
==
NULL
||
p_sys
->
SoundConverterBeginConversion
==
NULL
)
{
msg_Err
(
p_dec
,
"failed geting proc address"
);
msg_Err
(
p_dec
,
"failed get
t
ing proc address"
);
return
VLC_EGENERIC
;
}
...
...
@@ -1002,7 +1002,7 @@ static int QTVideoInit( decoder_t *p_dec )
if
(
p_sys
->
InitializeQTML
==
NULL
)
{
msg_Dbg
(
p_dec
,
"failed geting proc address InitializeQTML"
);
msg_Dbg
(
p_dec
,
"failed get
t
ing proc address InitializeQTML"
);
return
VLC_EGENERIC
;
}
if
(
p_sys
->
FindNextComponent
==
NULL
||
...
...
@@ -1015,7 +1015,7 @@ static int QTVideoInit( decoder_t *p_dec )
p_sys
->
QTNewGWorldFromPtr
==
NULL
||
p_sys
->
NewHandleClear
==
NULL
)
{
msg_Err
(
p_dec
,
"failed geting proc address"
);
msg_Err
(
p_dec
,
"failed get
t
ing proc address"
);
return
VLC_EGENERIC
;
}
#endif
/* SYS_DARWIN */
...
...
modules/codec/speex.c
View file @
fea7f383
...
...
@@ -2,7 +2,7 @@
* speex.c: speex decoder/packetizer/encoder module making use of libspeex.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: speex.c,v 1.
9
2004/01/
0
5 1
3:07:02 zorglub
Exp $
* $Id: speex.c,v 1.
10
2004/01/
2
5 1
8:20:12 bigben
Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
...
...
@@ -208,7 +208,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
/* Take care of the initial Speex header */
if
(
ProcessHeader
(
p_dec
,
&
oggpacket
)
!=
VLC_SUCCESS
)
{
msg_Err
(
p_dec
,
"
I
nitial Speex header is corrupted"
);
msg_Err
(
p_dec
,
"
i
nitial Speex header is corrupted"
);
block_Release
(
*
pp_block
);
return
NULL
;
}
...
...
@@ -246,13 +246,13 @@ static int ProcessHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
speex_packet_to_header
(
p_oggpacket
->
packet
,
p_oggpacket
->
bytes
);
if
(
!
p_header
)
{
msg_Err
(
p_dec
,
"
C
annot read Speex header"
);
msg_Err
(
p_dec
,
"
c
annot read Speex header"
);
return
VLC_EGENERIC
;
}
if
(
p_header
->
mode
>=
SPEEX_NB_MODES
)
{
msg_Err
(
p_dec
,
"
M
ode number %d does not (yet/any longer) exist in "
"this version of libspeex"
,
p_header
->
mode
);
msg_Err
(
p_dec
,
"
m
ode number %d does not (yet/any longer) exist in "
"this version of libspeex
.
"
,
p_header
->
mode
);
return
VLC_EGENERIC
;
}
...
...
@@ -260,20 +260,20 @@ static int ProcessHeader( decoder_t *p_dec, ogg_packet *p_oggpacket )
if
(
p_header
->
speex_version_id
>
1
)
{
msg_Err
(
p_dec
,
"
T
his file was encoded with Speex bit-stream "
"version %d, which I don't know how to decode"
,
msg_Err
(
p_dec
,
"
t
his file was encoded with Speex bit-stream "
"version %d, which I don't know how to decode
.
"
,
p_header
->
speex_version_id
);