Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
0ade81b0
Commit
0ade81b0
authored
Mar 18, 2006
by
Christophe Mutricy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All: string review (refs: #438)
parent
e970f05f
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
76 additions
and
74 deletions
+76
-74
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+2
-2
modules/demux/asf/libasf.c
modules/demux/asf/libasf.c
+10
-10
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+1
-1
modules/demux/flac.c
modules/demux/flac.c
+1
-1
modules/demux/m3u.c
modules/demux/m3u.c
+1
-1
modules/demux/mjpeg.c
modules/demux/mjpeg.c
+6
-6
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+1
-1
modules/demux/nsc.c
modules/demux/nsc.c
+2
-2
modules/demux/playlist/b4s.c
modules/demux/playlist/b4s.c
+1
-1
modules/demux/playlist/pls.c
modules/demux/playlist/pls.c
+1
-1
modules/demux/playlist/podcast.c
modules/demux/playlist/podcast.c
+1
-1
modules/demux/rawdv.c
modules/demux/rawdv.c
+2
-2
modules/demux/sgimb.c
modules/demux/sgimb.c
+7
-7
modules/demux/subtitle.c
modules/demux/subtitle.c
+2
-2
modules/demux/ts.c
modules/demux/ts.c
+17
-14
modules/demux/ty.c
modules/demux/ty.c
+3
-3
modules/demux/vobsub.c
modules/demux/vobsub.c
+10
-10
modules/demux/voc.c
modules/demux/voc.c
+7
-8
modules/demux/wav.c
modules/demux/wav.c
+1
-1
No files found.
modules/demux/asf/asf.c
View file @
0ade81b0
...
...
@@ -156,7 +156,7 @@ static int Demux( demux_t *p_demux )
ASF_GetGUID
(
&
guid
,
p_peek
);
if
(
ASF_CmpGUID
(
&
guid
,
&
asf_object_header_guid
)
)
{
msg_Warn
(
p_demux
,
"
F
ound a new ASF header"
);
msg_Warn
(
p_demux
,
"
f
ound a new ASF header"
);
/* We end this stream */
DemuxEnd
(
p_demux
);
...
...
@@ -366,7 +366,7 @@ static int DemuxPacket( demux_t *p_demux )
i_packet_send_time
=
GetDWLE
(
p_peek
+
i_skip
);
i_skip
+=
4
;
i_packet_duration
=
GetWLE
(
p_peek
+
i_skip
);
i_skip
+=
2
;
// i_packet_size_left = i_packet_length; // XXX d
onn�s reellement lu
// i_packet_size_left = i_packet_length; // XXX d
ata really read
/* FIXME I have to do that for some file, I don't known why */
i_packet_size_left
=
i_data_packet_min
;
...
...
modules/demux/asf/libasf.c
View file @
0ade81b0
...
...
@@ -407,7 +407,7 @@ static int ASF_ReadObject_metadata( stream_t *s, asf_object_t *p_obj )
for
(
j
=
0
;
j
<
p_meta
->
i_record_entries_count
;
j
++
)
{
asf_metadata_record_t
*
p_rec
=
&
p_meta
->
record
[
j
];
if
(
p_rec
->
i_type
==
ASF_METADATA_TYPE_STRING
)
msg_Dbg
(
s
,
" - %s=%s"
,
p_rec
->
psz_name
,
p_rec
->
p_data
);
...
...
@@ -717,7 +717,7 @@ static int ASF_ReadObject_content_description(stream_t *s, asf_object_t *p_obj)
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
content description object
\"
title:
\"
%s
\"
author:
\"
%s
\"
copyright:
\"
%s
\"
description:
\"
%s
\"
rating:
\"
%s
\"
"
,
"
r
ead
\"
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
,
...
...
@@ -779,7 +779,7 @@ static int ASF_ReadObject_language_list(stream_t *s, asf_object_t *p_obj)
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
language list object
\"
%d entries"
,
msg_Dbg
(
s
,
"
r
ead
\"
language list object
\"
%d entries"
,
p_ll
->
i_language
);
for
(
i
=
0
;
i
<
p_ll
->
i_language
;
i
++
)
msg_Dbg
(
s
,
" - '%s'"
,
...
...
@@ -820,12 +820,12 @@ static int ASF_ReadObject_stream_bitrate_properties( stream_t *s,
{
p_sb
->
bitrate
[
i
].
i_stream_number
=
GetWLE
(
&
p_data
[
0
]
)
&
0x7f
;
p_sb
->
bitrate
[
i
].
i_avg_bitrate
=
GetDWLE
(
&
p_data
[
2
]
);
p_data
+=
2
+
4
;
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
stream bitrate properties object
\"
"
);
msg_Dbg
(
s
,
"
r
ead
\"
stream bitrate properties object
\"
"
);
for
(
i
=
0
;
i
<
p_sb
->
i_bitrate
;
i
++
)
{
msg_Dbg
(
s
,
" - stream=%d bitrate=%d"
,
...
...
@@ -883,7 +883,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
p_esp
->
pi_stream_name_language
[
i
]
=
GetWLE
(
&
p_data
[
0
]
);
i_size
=
GetWLE
(
&
p_data
[
2
]
);
p_data
+=
2
;
psz
=
calloc
(
i_size
/
2
+
1
,
sizeof
(
char
)
);
for
(
i_len
=
0
;
i_len
<
i_size
/
2
;
i_len
++
)
{
...
...
@@ -924,7 +924,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
extended stream properties object
\"
:"
);
msg_Dbg
(
s
,
"
r
ead
\"
extended stream properties object
\"
:"
);
msg_Dbg
(
s
,
" - start="
I64Fd
" end="
I64Fd
,
p_esp
->
i_start_time
,
p_esp
->
i_end_time
);
msg_Dbg
(
s
,
" - data bitrate=%d buffer=%d initial fullness=%d"
,
...
...
@@ -991,7 +991,7 @@ static int ASF_ReadObject_advanced_mutual_exclusion( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
advanced mutual exclusion object
\"
"
);
msg_Dbg
(
s
,
"
r
ead
\"
advanced mutual exclusion object
\"
"
);
for
(
i
=
0
;
i
<
p_ae
->
i_stream_number_count
;
i
++
)
msg_Dbg
(
s
,
" - stream=%d"
,
p_ae
->
pi_stream_number
[
i
]
);
#endif
...
...
@@ -1033,7 +1033,7 @@ static int ASF_ReadObject_stream_prioritization( stream_t *s,
p_sp
->
pi_priority_flag
[
i
]
=
GetWLE
(
p_data
);
p_data
+=
2
;
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
stream prioritization object
\"
"
);
msg_Dbg
(
s
,
"
r
ead
\"
stream prioritization object
\"
"
);
for
(
i
=
0
;
i
<
p_sp
->
i_priority_count
;
i
++
)
msg_Dbg
(
s
,
" - Stream:%d flags=0x%x"
,
p_sp
->
pi_priority_stream_number
[
i
],
...
...
@@ -1137,7 +1137,7 @@ static int ASF_ReadObject_extended_content_description( stream_t *s,
}
#ifdef ASF_DEBUG
msg_Dbg
(
s
,
"
R
ead
\"
extended content description object
\"
"
);
msg_Dbg
(
s
,
"
r
ead
\"
extended content description object
\"
"
);
for
(
i
=
0
;
i
<
p_ec
->
i_count
;
i
++
)
msg_Dbg
(
s
,
" - '%s' = '%s'"
,
p_ec
->
ppsz_name
[
i
],
...
...
modules/demux/avi/avi.c
View file @
0ade81b0
...
...
@@ -40,7 +40,7 @@
*****************************************************************************/
#define INTERLEAVE_TEXT N_("Force interleaved method" )
#define INTERLEAVE_LONGTEXT N_( "Force interleaved method" )
#define INTERLEAVE_LONGTEXT N_( "Force interleaved method
.
" )
#define INDEX_TEXT N_("Force index creation")
#define INDEX_LONGTEXT N_( \
...
...
modules/demux/flac.c
View file @
0ade81b0
...
...
@@ -230,7 +230,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
/* FIXME bitrate */
if
(
i_query
==
DEMUX_SET_TIME
)
return
VLC_EGENERIC
;
else
if
(
i_query
==
DEMUX_GET_META
)
{
{
vlc_meta_t
**
pp_meta
=
(
vlc_meta_t
**
)
va_arg
(
args
,
vlc_meta_t
**
);
if
(
p_demux
->
p_sys
->
p_meta
)
*
pp_meta
=
vlc_meta_Duplicate
(
p_demux
->
p_sys
->
p_meta
);
...
...
modules/demux/m3u.c
View file @
0ade81b0
...
...
@@ -191,7 +191,7 @@ static int Activate( vlc_object_t * p_this )
/* Allocate p_m3u */
p_demux
->
p_sys
=
malloc
(
sizeof
(
demux_sys_t
)
);
p_demux
->
p_sys
->
i_type
=
i_type
;
msg_Dbg
(
p_this
,
"
P
laylist type: %d - %d"
,
i_type
,
i_type2
);
msg_Dbg
(
p_this
,
"
p
laylist type: %d - %d"
,
i_type
,
i_type2
);
return
VLC_SUCCESS
;
}
...
...
modules/demux/mjpeg.c
View file @
0ade81b0
...
...
@@ -43,7 +43,7 @@ static void Close( vlc_object_t * );
#define FPS_TEXT N_("Frames per Second")
#define FPS_LONGTEXT N_("This is the desired frame rate when " \
"playing MJPEG from a file. Use 0 (this is the default value) for a " \
"live stream (from
the
camera).")
"live stream (from
a
camera).")
vlc_module_begin
();
set_shortname
(
"MJPEG"
);
...
...
@@ -236,7 +236,7 @@ static vlc_bool_t CheckMimeHeader( demux_t *p_demux, int *p_header_size )
}
else
{
msg_Dbg
(
p_demux
,
"
D
iscard MIME header: %s"
,
psz_line
);
msg_Dbg
(
p_demux
,
"
d
iscard MIME header: %s"
,
psz_line
);
}
free
(
psz_line
);
psz_line
=
GetLine
(
p_demux
,
&
i_pos
);
...
...
@@ -408,11 +408,11 @@ static int MjpgDemux( demux_t *p_demux )
i
++
;
if
(
i
>=
p_sys
->
i_data_peeked
)
{
msg_Dbg
(
p_demux
,
"
D
id not find JPEG EOI in %d bytes"
,
msg_Dbg
(
p_demux
,
"
d
id not find JPEG EOI in %d bytes"
,
p_sys
->
i_data_peeked
);
if
(
!
Peek
(
p_demux
,
VLC_FALSE
)
)
{
msg_Warn
(
p_demux
,
"
N
o more data is available at the moment"
);
msg_Warn
(
p_demux
,
"
n
o more data is available at the moment"
);
return
0
;
}
}
...
...
@@ -471,7 +471,7 @@ static int MimeDemux( demux_t *p_demux )
if
(
!
Peek
(
p_demux
,
VLC_FALSE
)
)
{
msg_Warn
(
p_demux
,
"
N
o more data is available at the "
msg_Warn
(
p_demux
,
"
n
o more data is available at the "
"moment"
);
return
0
;
}
...
...
@@ -491,7 +491,7 @@ static int MimeDemux( demux_t *p_demux )
if
(
!
b_match
)
{
msg_Err
(
p_demux
,
"
D
iscard non-JPEG part"
);
msg_Err
(
p_demux
,
"
d
iscard non-JPEG part"
);
stream_Read
(
p_demux
->
s
,
NULL
,
i
);
return
0
;
}
...
...
modules/demux/mp4/mp4.c
View file @
0ade81b0
...
...
@@ -888,7 +888,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return
VLC_EGENERIC
;
default:
msg_Warn
(
p_demux
,
"control query unimplemented
!!
!"
);
msg_Warn
(
p_demux
,
"control query unimplemented!"
);
return
VLC_EGENERIC
;
}
}
...
...
modules/demux/nsc.c
View file @
0ade81b0
...
...
@@ -211,7 +211,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf16
=
(
unsigned
char
*
)
malloc
(
buf16_size
);
if
(
buf16
==
NULL
)
{
msg_Err
(
p_demux
,
"
O
ut of memory"
);
msg_Err
(
p_demux
,
"
o
ut of memory"
);
return
NULL
;
}
...
...
@@ -229,7 +229,7 @@ char *nscdec( vlc_object_t *p_demux, char* p_encoded )
buf8
=
(
char
*
)
malloc
(
buf8_size
+
1
);
if
(
buf8
==
NULL
)
{
msg_Err
(
p_demux
,
"
O
ut of memory"
);
msg_Err
(
p_demux
,
"
o
ut of memory"
);
free
(
(
void
*
)
buf16
);
return
NULL
;
}
...
...
modules/demux/playlist/b4s.c
View file @
0ade81b0
...
...
@@ -84,7 +84,7 @@ int E_(Import_B4S)( vlc_object_t *p_this )
p_demux
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
demux_sys_t
)
);
if
(
p_sys
==
NULL
)
{
msg_Err
(
p_demux
,
"
O
ut of memory"
);
msg_Err
(
p_demux
,
"
o
ut of memory"
);
return
VLC_ENOMEM
;
}
p_sys
->
b_shout
=
p_demux
->
psz_demux
&&
...
...
modules/demux/playlist/pls.c
View file @
0ade81b0
...
...
@@ -76,7 +76,7 @@ int E_(Import_PLS)( vlc_object_t *p_this )
p_demux
->
p_sys
=
malloc
(
sizeof
(
demux_sys_t
)
);
if
(
p_demux
->
p_sys
==
NULL
)
{
msg_Err
(
p_demux
,
"
O
ut of memory"
);
msg_Err
(
p_demux
,
"
o
ut of memory"
);
return
VLC_ENOMEM
;
}
p_demux
->
p_sys
->
psz_prefix
=
E_
(
FindPrefix
)(
p_demux
);
...
...
modules/demux/playlist/podcast.c
View file @
0ade81b0
...
...
@@ -76,7 +76,7 @@ int E_(Import_podcast)( vlc_object_t *p_this )
p_demux
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
demux_sys_t
)
);
if
(
p_sys
==
NULL
)
{
msg_Err
(
p_demux
,
"
O
ut of memory"
);
msg_Err
(
p_demux
,
"
o
ut of memory"
);
return
VLC_ENOMEM
;
}
p_sys
->
psz_prefix
=
E_
(
FindPrefix
)(
p_demux
);
...
...
modules/demux/rawdv.c
View file @
0ade81b0
...
...
@@ -396,7 +396,7 @@ static block_t *dv_extract_audio( demux_t *p_demux,
i_audio_quant
=
p_buf
[
4
]
&
0x07
;
/* 0 - 16bit, 1 - 12bit */
if
(
i_audio_quant
>
1
)
{
msg_Dbg
(
p_demux
,
"
U
nsupported quantization for DV audio"
);
msg_Dbg
(
p_demux
,
"
u
nsupported quantization for DV audio"
);
return
NULL
;
}
...
...
@@ -451,7 +451,7 @@ static block_t *dv_extract_audio( demux_t *p_demux,
else
{
/* 12bit quantization */
lc
=
((
uint16_t
)
p_frame
[
d
]
<<
4
)
|
lc
=
((
uint16_t
)
p_frame
[
d
]
<<
4
)
|
((
uint16_t
)
p_frame
[
d
+
2
]
>>
4
);
lc
=
(
lc
==
0x800
?
0
:
dv_audio_12to16
(
lc
));
...
...
modules/demux/sgimb.c
View file @
0ade81b0
...
...
@@ -337,7 +337,7 @@ static int Demux ( demux_t *p_demux )
playlist_t
*
p_playlist
;
playlist_item_t
*
p_item
;
playlist_item_t
*
p_child
;
char
*
psz_line
;
p_playlist
=
(
playlist_t
*
)
vlc_object_find
(
p_demux
,
VLC_OBJECT_PLAYLIST
,
...
...
@@ -375,10 +375,10 @@ static int Demux ( demux_t *p_demux )
if
(
p_sys
->
psz_server
&&
p_sys
->
psz_location
)
{
char
*
temp
;
asprintf
(
&
temp
,
"rtsp://"
"%s:%i%s"
,
p_sys
->
psz_server
,
p_sys
->
i_port
>
0
?
p_sys
->
i_port
:
554
,
p_sys
->
psz_location
);
p_sys
->
psz_uri
=
strdup
(
temp
);
free
(
temp
);
}
...
...
@@ -395,7 +395,7 @@ static int Demux ( demux_t *p_demux )
msg_Err
(
p_demux
,
"no URI was found"
);
return
-
1
;
}
asprintf
(
&
temp
,
"%s%%3FMeDiAbAsEshowingId=%d%%26MeDiAbAsEconcert%%3FMeDiAbAsE"
,
p_sys
->
psz_uri
,
p_sys
->
i_sid
);
...
...
@@ -424,9 +424,9 @@ static int Demux ( demux_t *p_demux )
if
(
!
p_sys
->
psz_mcast_ip
)
{
char
*
psz_option
;
asprintf
(
&
psz_option
,
"rtsp-caching=5000"
);
playlist_ItemAddOption
(
p_child
,
psz_option
);
free
(
psz_option
);
asprintf
(
&
psz_option
,
"rtsp-caching=5000"
);
playlist_ItemAddOption
(
p_child
,
psz_option
);
free
(
psz_option
);
}
if
(
!
p_sys
->
psz_mcast_ip
&&
p_sys
->
b_rtsp_kasenna
)
{
...
...
modules/demux/subtitle.c
View file @
0ade81b0
...
...
@@ -704,9 +704,9 @@ static int ParseMicroDvd( demux_t *p_demux, subtitle_t *p_subtitle )
unsigned
int
i
;
int
i_microsecperframe
=
40000
;
/* default to 25 fps */
if
(
p_sys
->
i_microsecperframe
>
0
)
if
(
p_sys
->
i_microsecperframe
>
0
)
i_microsecperframe
=
p_sys
->
i_microsecperframe
;
p_subtitle
->
i_start
=
0
;
p_subtitle
->
i_stop
=
0
;
p_subtitle
->
psz_text
=
NULL
;
...
...
modules/demux/ts.c
View file @
0ade81b0
...
...
@@ -82,26 +82,29 @@ static void Close ( vlc_object_t * );
#define PMT_TEXT N_("Extra PMT")
#define PMT_LONGTEXT N_( \
"Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])" )
"Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])
.
" )
#define PID_TEXT N_("Set id of ES to PID")
#define PID_LONGTEXT N_("set id of es to pid")
#define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \
" handled by VLC to the same value as the PID in" \
" the TS stream, instead of 1, 2, 3, etc. Useful to" \
" do \'#duplicate{..., select=\"es=<pid>\"}\'.")
#define TSOUT_TEXT N_("Fast udp streaming")
#define TSOUT_LONGTEXT N_( \
"Sends TS to specific ip:port by udp (you must know what you are doing)")
"Sends TS to specific ip:port by udp (you must know what you are doing)
.
")
#define MTUOUT_TEXT N_("MTU for out mode")
#define MTUOUT_LONGTEXT N_("MTU for out mode")
#define MTUOUT_LONGTEXT N_("MTU for out mode
.
")
#define CSA_TEXT N_("CSA ck")
#define CSA_LONGTEXT N_("C
SA ck
")
#define CSA_LONGTEXT N_("C
ontrol word for the CSa encryption algorithm
")
#define SILENT_TEXT N_("Silent mode")
#define SILENT_LONGTEXT N_("
do not complain on encrypted PES
")
#define SILENT_LONGTEXT N_("
Do not complain on encrypted PES.
")
#define CAPMT_SYSID_TEXT N_("CAPMT System ID")
#define CAPMT_SYSID_LONGTEXT N_("
only forward descriptors from this SysID to the CAM
")
#define CAPMT_SYSID_LONGTEXT N_("
Only forward descriptors from this SysID to the CAM.
")
#define CPKT_TEXT N_("Packet size in bytes to decrypt")
#define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \
...
...
@@ -109,7 +112,7 @@ static void Close ( vlc_object_t * );
"decrypting. " )
#define TSDUMP_TEXT N_("Filename of dump")
#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in")
#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in
.
")
#define APPEND_TEXT N_("Append")
#define APPEND_LONGTEXT N_( \
...
...
@@ -133,7 +136,7 @@ vlc_module_begin();
add_integer
(
"ts-out-mtu"
,
1500
,
NULL
,
MTUOUT_TEXT
,
MTUOUT_LONGTEXT
,
VLC_TRUE
);
add_string
(
"ts-csa-ck"
,
NULL
,
NULL
,
CSA_TEXT
,
CSA_LONGTEXT
,
VLC_TRUE
);
add_integer
(
"ts-csa-pkt"
,
188
,
NULL
,
CPKT_TEXT
,
CPKT_LONGTEXT
,
VLC_TRUE
);
add_integer
(
"ts-csa-pkt"
,
188
,
NULL
,
CPKT_TEXT
,
CPKT_LONGTEXT
,
VLC_TRUE
);
add_bool
(
"ts-silent"
,
0
,
NULL
,
SILENT_TEXT
,
SILENT_LONGTEXT
,
VLC_TRUE
);
add_file
(
"ts-dump-file"
,
NULL
,
NULL
,
TSDUMP_TEXT
,
TSDUMP_LONGTEXT
,
VLC_FALSE
);
...
...
@@ -326,7 +329,7 @@ struct demux_sys_t
FILE
*
p_file
;
/* filehandle */
uint64_t
i_write
;
/* bytes written */
vlc_bool_t
b_file_out
;
/* dump mode enabled */
/* */
vlc_bool_t
b_meta
;
};
...
...
@@ -832,7 +835,7 @@ static int DemuxFile( demux_t *p_demux )
i_data
=
stream_Read
(
p_demux
->
s
,
p_sys
->
buffer
,
i_bufsize
);
if
(
(
i_data
<=
0
)
&&
(
i_data
<
p_sys
->
i_packet_size
)
)
{
msg_Dbg
(
p_demux
,
"
E
rror reading malformed packets"
);
msg_Dbg
(
p_demux
,
"
e
rror reading malformed packets"
);
return
i_data
;
}
...
...
@@ -1945,13 +1948,13 @@ static iod_descriptor_t *IODNew( int i_data, uint8_t *p_data )
byte1
=
IODGetByte
(
&
i_data
,
&
p_data
);
byte2
=
IODGetByte
(
&
i_data
,
&
p_data
);
byte3
=
IODGetByte
(
&
i_data
,
&
p_data
);
if
(
byte2
==
0x02
)
//old vlc's buggy implementation of the IOD_descriptor
if
(
byte2
==
0x02
)
//old vlc's buggy implementation of the IOD_descriptor
{
p_iod
->
i_iod_label_scope
=
0x11
;
p_iod
->
i_iod_label
=
byte1
;
i_iod_tag
=
byte2
;
}
else
//correct implementation of the IOD_descriptor
else
//correct implementation of the IOD_descriptor
{
p_iod
->
i_iod_label_scope
=
byte1
;
p_iod
->
i_iod_label
=
byte2
;
...
...
@@ -2910,7 +2913,7 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
{
dvbpsi_stream_identifier_dr_t
*
si
;
si
=
dvbpsi_DecodeStreamIdentifierDr
(
p_dr
);
msg_Dbg
(
p_demux
,
" * Stream Component Identifier: %d"
,
si
->
i_component_tag
);
}
#endif
...
...
modules/demux/ty.c
View file @
0ade81b0
...
...
@@ -371,7 +371,7 @@ int TyDemux(demux_t *p_demux)
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
/*msg_Dbg(p_demux, "ty demux processing" );*/
/* did we hit EOF earlier? */
if
(
p_sys
->
eof
)
return
0
;
...
...
@@ -386,7 +386,7 @@ int TyDemux(demux_t *p_demux)
* - set PTS for data packets
* - pass the data on to the proper codec via es_out_Send()
* if this is the first time or
* if this is the first time or
* if we're at the end of this chunk, start a new one
*/
/* parse the next chunk's record headers */
...
...
@@ -784,7 +784,7 @@ static int ty_stream_seek(demux_t *p_demux, double seek_pct)
/* seek within the chunk to get roughly to where we want */
p_sys
->
i_cur_rec
=
(
int
)
((
double
)
((
seek_pos
%
CHUNK_SIZE
)
/
(
double
)
(
CHUNK_SIZE
))
*
p_sys
->
i_num_recs
);
msg_Dbg
(
p_demux
,
"
S
eeked to file pos "
I64Fd
,
seek_pos
);
msg_Dbg
(
p_demux
,
"
s
eeked to file pos "
I64Fd
,
seek_pos
);
msg_Dbg
(
p_demux
,
" (chunk %d, record %d)"
,
p_sys
->
i_chunk_count
-
1
,
p_sys
->
i_cur_rec
);
...
...
modules/demux/vobsub.c
View file @
0ade81b0
...
...
@@ -80,7 +80,7 @@ typedef struct
es_format_t
fmt
;
es_out_id_t
*
p_es
;
int
i_track_id
;
int
i_current_subtitle
;
int
i_subtitles
;
subtitle_t
*
p_subtitles
;
...
...
@@ -95,11 +95,11 @@ struct demux_sys_t
text_t
txt
;
stream_t
*
p_vobsub_stream
;
/* all tracks */
int
i_tracks
;
vobsub_track_t
*
track
;
int
i_original_frame_width
;
int
i_original_frame_height
;
vlc_bool_t
b_palette
;
...
...
@@ -212,7 +212,7 @@ static void Close( vlc_object_t *p_this )
if
(
p_sys
->
track
[
i
].
p_subtitles
)
free
(
p_sys
->
track
[
i
].
p_subtitles
);
}
if
(
p_sys
->
track
)
free
(
p_sys
->
track
);
if
(
p_sys
->
p_vobsub_stream
)
stream_Delete
(
p_sys
->
p_vobsub_stream
);
...
...
@@ -472,7 +472,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
{
return
(
VLC_EGENERIC
);
}
if
(
*
line
==
0
||
*
line
==
'\r'
||
*
line
==
'\n'
||
*
line
==
'#'
)
continue
;
else
if
(
!
strncmp
(
"size:"
,
line
,
5
)
)
...
...
@@ -546,7 +546,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
current_tk
->
p_subtitles
=
(
subtitle_t
*
)
malloc
(
sizeof
(
subtitle_t
)
);;
current_tk
->
i_track_id
=
i_track_id
;
current_tk
->
i_delay
=
(
int64_t
)
0
;
es_format_Init
(
&
fmt
,
SPU_ES
,
VLC_FOURCC
(
's'
,
'p'
,
'u'
,
' '
)
);
fmt
.
subs
.
spu
.
i_original_frame_width
=
p_sys
->
i_original_frame_width
;
fmt
.
subs
.
spu
.
i_original_frame_height
=
p_sys
->
i_original_frame_height
;
...
...
@@ -574,7 +574,7 @@ static int ParseVobSubIDX( demux_t *p_demux )
int
h
,
m
,
s
,
ms
,
count
,
loc
=
0
;
int
i_sign
=
1
;
int64_t
i_start
,
i_location
=
0
;
vobsub_track_t
*
current_tk
=
&
p_sys
->
track
[
p_sys
->
i_tracks
-
1
];
if
(
sscanf
(
line
,
"timestamp: %d%n:%d:%d:%d, filepos: %x"
,
...
...
@@ -592,11 +592,11 @@ static int ParseVobSubIDX( demux_t *p_demux )
s
*
1000
+
ms
)
*
1000
;
i_location
=
loc
;
current_tk
->
i_subtitles
++
;
current_tk
->
p_subtitles
=
(
subtitle_t
*
)
realloc
(
current_tk
->
p_subtitles
,
sizeof
(
subtitle_t
)
*
(
current_tk
->
i_subtitles
+
1
)
);
current_sub
=
&
current_tk
->
p_subtitles
[
current_tk
->
i_subtitles
-
1
];
current_sub
->
i_start
=
(
int64_t
)
i_start
*
i_sign
;
current_sub
->
i_start
+=
current_tk
->
i_delay
;
current_sub
->
i_vobsub_location
=
i_location
;
...
...
@@ -685,7 +685,7 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk )
#define tk p_sys->track[i]
p_pkt
->
i_dts
=
p_pkt
->
i_pts
=
p_bk
->
i_pts
;
p_pkt
->
i_length
=
0
;
if
(
tk
.
p_es
&&
tk
.
i_track_id
==
i_spu
)
{
es_out_Send
(
p_demux
->
out
,
tk
.
p_es
,
p_pkt
);
...
...
modules/demux/voc.c
View file @
0ade81b0
...
...
@@ -156,7 +156,6 @@ static unsigned int fix_voc_sr( unsigned int sr )
}
return
sr
;
}
static
int
ReadBlockHeader
(
demux_t
*
p_demux
)
{
...
...
@@ -189,7 +188,7 @@ static int ReadBlockHeader( demux_t *p_demux )
if
(
buf
[
1
]
)
{
msg_Err
(
p_demux
,
"
U
nsupported compression"
);
msg_Err
(
p_demux
,
"
u
nsupported compression"
);
return
VLC_EGENERIC
;
}
...
...
@@ -265,7 +264,7 @@ static int ReadBlockHeader( demux_t *p_demux )
if
(
buf
[
2
]
)
{
msg_Err
(
p_demux
,
"
U
nsupported compression"
);
msg_Err
(
p_demux
,
"
u
nsupported compression"
);
return
VLC_EGENERIC
;
}
...
...
@@ -295,7 +294,7 @@ static int ReadBlockHeader( demux_t *p_demux )
if
(
buf
[
1
]
)
{
msg_Err
(
p_demux
,
"
U
nsupported compression"
);
msg_Err
(
p_demux
,
"
u
nsupported compression"
);
return
VLC_EGENERIC
;
}
...
...
@@ -328,7 +327,7 @@ static int ReadBlockHeader( demux_t *p_demux )
break
;
default:
msg_Err
(
p_demux
,
"
U
nsupported bit res.: %u bits"
,
msg_Err
(
p_demux
,
"
u
nsupported bit res.: %u bits"
,
new_fmt
.
audio
.
i_bitspersample
);
return
VLC_EGENERIC
;
}
...
...
@@ -346,14 +345,14 @@ static int ReadBlockHeader( demux_t *p_demux )
break
;
default:
msg_Err
(
p_demux
,
"
U
nsupported bit res.: %u bits"
,
msg_Err
(
p_demux
,
"
u
nsupported bit res.: %u bits"
,
new_fmt
.
audio
.
i_bitspersample
);
return
VLC_EGENERIC
;
}
break
;
default:
msg_Err
(
p_demux
,
"
U
nsupported compression"
);
msg_Err
(
p_demux
,
"
u
nsupported compression"
);
return
VLC_EGENERIC
;
}
...
...
@@ -366,7 +365,7 @@ static int ReadBlockHeader( demux_t *p_demux )
break
;
default:
msg_Dbg
(
p_demux
,
"
U
nknown block type %u - skipping block"
,
msg_Dbg
(
p_demux
,
"
u
nknown block type %u - skipping block"
,
(
unsigned
)
*
buf
);
case
4
:
/* blocks of non-audio types can be skipped */
case
5
:
...
...
modules/demux/wav.c
View file @
0ade81b0
...
...
@@ -381,7 +381,7 @@ static int ChunkFind( demux_t *p_demux, char *fcc, unsigned int *pi_size )
i_size
=
GetDWLE
(
p_peek
+
4
);
msg_Dbg
(
p_demux
,
"
C
hunk: fcc=`%4.4s` size=%d"
,
p_peek
,
i_size
);
msg_Dbg
(
p_demux
,
"
c
hunk: fcc=`%4.4s` size=%d"
,
p_peek
,
i_size
);
if
(
!
memcmp
(
p_peek
,
fcc
,
4
)
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment