Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Gautam Chitnis
web-ui-redesign
Commits
57bbabb5
Commit
57bbabb5
authored
Apr 14, 2008
by
Pierre d'Herbemont
Browse files
demux: Rename demux2 to demux as demux is no longer existing.
parent
63823295
Changes
62
Hide whitespace changes
Inline
Side-by-side
include/vlc_demux.h
View file @
57bbabb5
...
...
@@ -144,13 +144,13 @@ enum demux_query_e
DEMUX_CAN_SEEK
,
/* arg1= bool* can fail (assume false)*/
};
VLC_EXPORT
(
int
,
demux
2
_vaControlHelper
,
(
stream_t
*
,
int64_t
i_start
,
int64_t
i_end
,
int
i_bitrate
,
int
i_align
,
int
i_query
,
va_list
args
)
);
VLC_EXPORT
(
int
,
demux_vaControlHelper
,
(
stream_t
*
,
int64_t
i_start
,
int64_t
i_end
,
int
i_bitrate
,
int
i_align
,
int
i_query
,
va_list
args
)
);
/*************************************************************************
* Miscellaneous helpers for demuxers
*************************************************************************/
static
inline
bool
demux
2
_IsPathExtension
(
demux_t
*
p_demux
,
const
char
*
psz_extension
)
static
inline
bool
demux_IsPathExtension
(
demux_t
*
p_demux
,
const
char
*
psz_extension
)
{
const
char
*
psz_ext
=
strrchr
(
p_demux
->
psz_path
,
'.'
);
if
(
!
psz_ext
||
strcasecmp
(
psz_ext
,
psz_extension
)
)
...
...
@@ -158,7 +158,7 @@ static inline bool demux2_IsPathExtension( demux_t *p_demux, const char *psz_ext
return
true
;
}
static
inline
bool
demux
2
_IsForced
(
demux_t
*
p_demux
,
const
char
*
psz_name
)
static
inline
bool
demux_IsForced
(
demux_t
*
p_demux
,
const
char
*
psz_name
)
{
if
(
!
p_demux
->
psz_demux
||
strcmp
(
p_demux
->
psz_demux
,
psz_name
)
)
return
false
;
...
...
@@ -177,25 +177,25 @@ static inline bool demux2_IsForced( demux_t *p_demux, const char *psz_name )
#define DEMUX_BY_EXTENSION( ext ) \
demux_t *p_demux = (demux_t *)p_this; \
if( !demux
2
_IsPathExtension( p_demux, ext ) ) \
if( !demux_IsPathExtension( p_demux, ext ) ) \
return VLC_EGENERIC; \
DEMUX_INIT_COMMON();
#define DEMUX_BY_EXTENSION_MSG( ext, msg ) \
demux_t *p_demux = (demux_t *)p_this; \
if( !demux
2
_IsPathExtension( p_demux, ext ) ) \
if( !demux_IsPathExtension( p_demux, ext ) ) \
return VLC_EGENERIC; \
STANDARD_DEMUX_INIT_MSG( msg );
#define DEMUX_BY_EXTENSION_OR_FORCED( ext, module ) \
demux_t *p_demux = (demux_t *)p_this; \
if( !demux
2
_IsPathExtension( p_demux, ext ) && !demux
2
_IsForced( p_demux, module ) ) \
if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
return VLC_EGENERIC; \
DEMUX_INIT_COMMON();
#define DEMUX_BY_EXTENSION_OR_FORCED_MSG( ext, module, msg ) \
demux_t *p_demux = (demux_t *)p_this; \
if( !demux
2
_IsPathExtension( p_demux, ext ) && !demux
2
_IsForced( p_demux, module ) ) \
if( !demux_IsPathExtension( p_demux, ext ) && !demux_IsForced( p_demux, module ) ) \
return VLC_EGENERIC; \
STANDARD_DEMUX_INIT_MSG( msg );
...
...
modules/access/directory.c
View file @
57bbabb5
...
...
@@ -107,7 +107,7 @@ vlc_module_begin();
add_submodule
();
set_description
(
"Directory EOF"
);
set_capability
(
"demux
2
"
,
0
);
set_capability
(
"demux"
,
0
);
set_callbacks
(
DemuxOpen
,
NULL
);
vlc_module_end
();
...
...
@@ -350,7 +350,7 @@ static int Demux( demux_t *p_demux )
*****************************************************************************/
static
int
DemuxControl
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
)
{
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
0
,
0
,
0
,
1
,
i_query
,
args
);
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
0
,
0
,
1
,
i_query
,
args
);
}
...
...
modules/codec/ffmpeg/ffmpeg.c
View file @
57bbabb5
...
...
@@ -209,7 +209,7 @@ vlc_module_begin();
/* demux submodule */
add_submodule
();
set_description
(
_
(
"FFmpeg demuxer"
)
);
set_capability
(
"demux
2
"
,
2
);
set_capability
(
"demux"
,
2
);
set_callbacks
(
E_
(
OpenDemux
),
E_
(
CloseDemux
)
);
/* mux submodule */
...
...
modules/demux/a52.c
View file @
57bbabb5
...
...
@@ -46,7 +46,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"Raw A/52 demuxer"
)
);
set_capability
(
"demux
2
"
,
145
);
set_capability
(
"demux"
,
145
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"a52"
);
vlc_module_end
();
...
...
@@ -260,7 +260,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
else
{
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
8
*
p_sys
->
i_mux_rate
,
1
,
i_query
,
args
);
}
...
...
modules/demux/aiff.c
View file @
57bbabb5
...
...
@@ -46,7 +46,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"AIFF demuxer"
)
);
set_capability
(
"demux
2
"
,
10
);
set_capability
(
"demux"
,
10
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"aiff"
);
vlc_module_end
();
...
...
modules/demux/asf/asf.c
View file @
57bbabb5
...
...
@@ -53,7 +53,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"ASF v1.0 demuxer"
)
);
set_capability
(
"demux
2
"
,
200
);
set_capability
(
"demux"
,
200
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"asf"
);
vlc_module_end
();
...
...
@@ -279,7 +279,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
else
{
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
return
demux_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
p_sys
->
i_data_end
,
p_sys
->
i_bitrate
,
p_sys
->
p_fp
->
i_min_data_packet_size
,
i_query
,
args
);
...
...
@@ -293,7 +293,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
*
pf
=
p_sys
->
i_time
/
(
double
)
p_sys
->
i_length
;
return
VLC_SUCCESS
;
}
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
return
demux_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
p_sys
->
i_data_end
,
p_sys
->
i_bitrate
,
p_sys
->
p_fp
->
i_min_data_packet_size
,
i_query
,
args
);
...
...
@@ -310,7 +310,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
}
else
{
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
return
demux_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
p_sys
->
i_data_end
,
p_sys
->
i_bitrate
,
p_sys
->
p_fp
->
i_min_data_packet_size
,
i_query
,
args
);
...
...
@@ -322,7 +322,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return
VLC_SUCCESS
;
default:
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
return
demux_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_begin
,
p_sys
->
i_data_end
,
p_sys
->
i_bitrate
,
p_sys
->
p_fp
->
i_min_data_packet_size
,
i_query
,
args
);
...
...
modules/demux/au.c
View file @
57bbabb5
...
...
@@ -47,7 +47,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"AU demuxer"
)
);
set_capability
(
"demux
2
"
,
10
);
set_capability
(
"demux"
,
10
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"au"
);
vlc_module_end
();
...
...
@@ -329,7 +329,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_header_size
,
-
1
,
return
demux_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_header_size
,
-
1
,
p_sys
->
fmt
.
i_bitrate
,
p_sys
->
fmt
.
audio
.
i_blockalign
,
i_query
,
args
);
}
...
...
modules/demux/avi/avi.c
View file @
57bbabb5
...
...
@@ -62,7 +62,7 @@ static const char *ppsz_indexes[] = { N_("Ask"), N_("Always fix"),
vlc_module_begin
();
set_shortname
(
"AVI"
);
set_description
(
_
(
"AVI demuxer"
)
);
set_capability
(
"demux
2
"
,
212
);
set_capability
(
"demux"
,
212
);
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
...
...
modules/demux/cdg.c
View file @
57bbabb5
...
...
@@ -44,7 +44,7 @@ vlc_module_begin();
set_description
(
_
(
"CDG demuxer"
)
);
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_capability
(
"demux
2
"
,
3
);
set_capability
(
"demux"
,
3
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"cdg"
);
add_shortcut
(
"subtitle"
);
...
...
@@ -77,7 +77,7 @@ static int Open( vlc_object_t * p_this )
/* Identify cdg file by extension, as there is no simple way to
* detect it */
if
(
!
demux
2
_IsPathExtension
(
p_demux
,
".cdg"
)
&&
!
demux
2
_IsForced
(
p_demux
,
"cdg"
)
)
if
(
!
demux_IsPathExtension
(
p_demux
,
".cdg"
)
&&
!
demux_IsForced
(
p_demux
,
"cdg"
)
)
return
VLC_EGENERIC
;
/* CDG file size has to be multiple of CDG_FRAME_SIZE (it works even
...
...
@@ -151,7 +151,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
switch
(
i_query
)
{
default:
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
8
*
CDG_FRAME_SIZE
*
CDG_FRAME_RATE
,
CDG_FRAME_SIZE
,
i_query
,
args
);
}
}
...
...
modules/demux/demuxdump.c
View file @
57bbabb5
...
...
@@ -52,7 +52,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"File dumper"
)
);
set_capability
(
"demux
2
"
,
0
);
set_capability
(
"demux"
,
0
);
add_file
(
"demuxdump-file"
,
"stream-demux.dump"
,
NULL
,
FILE_TEXT
,
FILE_LONGTEXT
,
false
);
change_unsafe
();
...
...
@@ -195,6 +195,6 @@ static int Demux( demux_t *p_demux )
*****************************************************************************/
static
int
Control
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
)
{
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
0
,
1
,
i_query
,
args
);
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
0
,
1
,
i_query
,
args
);
}
modules/demux/dts.c
View file @
57bbabb5
...
...
@@ -42,7 +42,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"Raw DTS demuxer"
)
);
set_capability
(
"demux
2
"
,
155
);
set_capability
(
"demux"
,
155
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"dts"
);
vlc_module_end
();
...
...
@@ -232,7 +232,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
if
(
i_query
==
DEMUX_SET_TIME
)
return
VLC_EGENERIC
;
else
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
8
*
p_sys
->
i_mux_rate
,
1
,
i_query
,
args
);
}
...
...
modules/demux/flac.c
View file @
57bbabb5
...
...
@@ -45,7 +45,7 @@ static void Close ( vlc_object_t * );
vlc_module_begin
();
set_description
(
_
(
"FLAC demuxer"
)
);
set_capability
(
"demux
2
"
,
155
);
set_capability
(
"demux"
,
155
);
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_callbacks
(
Open
,
Close
);
...
...
@@ -401,7 +401,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
return
VLC_SUCCESS
;
}
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_pos
,
-
1
,
return
demux_vaControlHelper
(
p_demux
->
s
,
p_sys
->
i_data_pos
,
-
1
,
8
*
0
,
1
,
i_query
,
args
);
}
...
...
modules/demux/gme.cpp
View file @
57bbabb5
...
...
@@ -52,7 +52,7 @@ static void Close ( vlc_object_t * );
vlc_module_begin
();
set_shortname
(
"GME"
);
set_description
(
_
(
"GME demuxer (Game_Music_Emu)"
)
);
set_capability
(
"demux
2
"
,
10
);
set_capability
(
"demux"
,
10
);
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_callbacks
(
Open
,
Close
);
...
...
modules/demux/live555.cpp
View file @
57bbabb5
...
...
@@ -81,7 +81,7 @@ static void Close( vlc_object_t * );
vlc_module_begin
();
set_description
(
_
(
"RTP/RTSP/SDP demuxer (using Live555)"
)
);
set_capability
(
"demux
2
"
,
50
);
set_capability
(
"demux"
,
50
);
set_shortname
(
"RTP/RTSP"
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"live"
);
...
...
modules/demux/mjpeg.c
View file @
57bbabb5
...
...
@@ -51,7 +51,7 @@ static void Close( vlc_object_t * );
vlc_module_begin
();
set_shortname
(
"MJPEG"
);
set_description
(
_
(
"M-JPEG camera demuxer"
)
);
set_capability
(
"demux
2
"
,
5
);
set_capability
(
"demux"
,
5
);
set_callbacks
(
Open
,
Close
);
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
...
...
@@ -345,8 +345,8 @@ static int Open( vlc_object_t * p_this )
/* Check for jpeg file extension */
p_sys
->
b_still
=
false
;
p_sys
->
i_still_end
=
0
;
if
(
demux
2
_IsPathExtension
(
p_demux
,
".jpeg"
)
||
demux
2
_IsPathExtension
(
p_demux
,
".jpg"
)
)
if
(
demux_IsPathExtension
(
p_demux
,
".jpeg"
)
||
demux_IsPathExtension
(
p_demux
,
".jpg"
)
)
{
p_sys
->
b_still
=
true
;
if
(
val
.
f_float
)
...
...
@@ -520,5 +520,5 @@ static void Close ( vlc_object_t * p_this )
*****************************************************************************/
static
int
Control
(
demux_t
*
p_demux
,
int
i_query
,
va_list
args
)
{
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
0
,
0
,
0
,
0
,
i_query
,
args
);
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
0
,
0
,
0
,
i_query
,
args
);
}
modules/demux/mkv.cpp
View file @
57bbabb5
...
...
@@ -398,7 +398,7 @@ static void Close( vlc_object_t * );
vlc_module_begin();
set_shortname( "Matroska" );
set_description( _("Matroska stream demuxer" ) );
set_capability( "demux
2
", 50 );
set_capability( "demux", 50 );
set_callbacks( Open, Close );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
...
...
modules/demux/mod.c
View file @
57bbabb5
...
...
@@ -67,7 +67,7 @@ static void Close ( vlc_object_t * );
vlc_module_begin
();
set_shortname
(
"MOD"
);
set_description
(
_
(
"MOD demuxer (libmodplug)"
)
);
set_capability
(
"demux
2
"
,
10
);
set_capability
(
"demux"
,
10
);
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
...
...
modules/demux/mp4/mp4.c
View file @
57bbabb5
...
...
@@ -55,7 +55,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"MP4 stream demuxer"
)
);
set_capability
(
"demux
2
"
,
242
);
set_capability
(
"demux"
,
242
);
set_callbacks
(
Open
,
Close
);
vlc_module_end
();
...
...
modules/demux/mpc.c
View file @
57bbabb5
...
...
@@ -55,7 +55,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"MusePack demuxer"
)
);
set_capability
(
"demux
2
"
,
145
);
set_capability
(
"demux"
,
145
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"mpc"
);
...
...
@@ -111,9 +111,9 @@ static int Open( vlc_object_t * p_this )
if
(
!
p_demux
->
b_force
)
{
/* Check file name extension */
if
(
!
demux
2
_IsPathExtension
(
p_demux
,
".mpc"
)
&&
!
demux
2
_IsPathExtension
(
p_demux
,
".mp+"
)
&&
!
demux
2
_IsPathExtension
(
p_demux
,
".mpp"
)
)
if
(
!
demux_IsPathExtension
(
p_demux
,
".mpc"
)
&&
!
demux_IsPathExtension
(
p_demux
,
".mp+"
)
&&
!
demux_IsPathExtension
(
p_demux
,
".mpp"
)
)
return
VLC_EGENERIC
;
}
}
...
...
modules/demux/mpeg/h264.c
View file @
57bbabb5
...
...
@@ -48,7 +48,7 @@ vlc_module_begin();
set_category
(
CAT_INPUT
);
set_subcategory
(
SUBCAT_INPUT_DEMUX
);
set_description
(
_
(
"H264 video demuxer"
)
);
set_capability
(
"demux
2
"
,
0
);
set_capability
(
"demux"
,
0
);
add_float
(
"h264-fps"
,
25
.
0
,
NULL
,
FPS_TEXT
,
FPS_LONGTEXT
,
true
);
set_callbacks
(
Open
,
Close
);
add_shortcut
(
"h264"
);
...
...
@@ -186,7 +186,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
if
(
i_query
==
DEMUX_SET_TIME
)
return
VLC_EGENERIC
;
else
return
demux
2
_vaControlHelper
(
p_demux
->
s
,
return
demux_vaControlHelper
(
p_demux
->
s
,
0
,
-
1
,
0
,
1
,
i_query
,
args
);
}
...
...
Prev
1
2
3
4
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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