Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
7b452ff3
Commit
7b452ff3
authored
May 12, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Used VLC_CODEC_* and i_original_fourcc when applicable.
parent
99d6464f
Changes
49
Hide whitespace changes
Inline
Side-by-side
Showing
49 changed files
with
378 additions
and
558 deletions
+378
-558
modules/codec/a52.c
modules/codec/a52.c
+0
-1
modules/codec/aes3.c
modules/codec/aes3.c
+2
-2
modules/codec/araw.c
modules/codec/araw.c
+3
-30
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+1
-1
modules/codec/cmml/cmml.c
modules/codec/cmml/cmml.c
+1
-1
modules/codec/cvdsub.c
modules/codec/cvdsub.c
+1
-3
modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.c
+15
-33
modules/codec/dts.c
modules/codec/dts.c
+1
-4
modules/codec/dvbsub.c
modules/codec/dvbsub.c
+1
-1
modules/codec/kate.c
modules/codec/kate.c
+2
-2
modules/codec/libmpeg2.c
modules/codec/libmpeg2.c
+14
-8
modules/codec/lpcm.c
modules/codec/lpcm.c
+0
-1
modules/codec/mash.cpp
modules/codec/mash.cpp
+0
-1
modules/codec/quicktime.c
modules/codec/quicktime.c
+14
-13
modules/codec/rawvideo.c
modules/codec/rawvideo.c
+6
-14
modules/codec/speex.c
modules/codec/speex.c
+2
-5
modules/codec/spudec/spudec.c
modules/codec/spudec/spudec.c
+1
-4
modules/codec/subtitles/subsdec.c
modules/codec/subtitles/subsdec.c
+2
-2
modules/codec/subtitles/subsusf.c
modules/codec/subtitles/subsusf.c
+1
-1
modules/codec/subtitles/t140.c
modules/codec/subtitles/t140.c
+2
-2
modules/codec/svcdsub.c
modules/codec/svcdsub.c
+2
-4
modules/codec/wmafixed/wma.c
modules/codec/wmafixed/wma.c
+3
-7
modules/codec/xvmc/xxmc.c
modules/codec/xvmc/xxmc.c
+19
-10
modules/demux/avformat/mux.c
modules/demux/avformat/mux.c
+1
-1
modules/demux/avi/avi.c
modules/demux/avi/avi.c
+13
-12
modules/demux/rawaud.c
modules/demux/rawaud.c
+13
-15
modules/demux/ts.c
modules/demux/ts.c
+1
-1
modules/demux/vc1.c
modules/demux/vc1.c
+1
-1
modules/misc/stats/decoder.c
modules/misc/stats/decoder.c
+1
-1
modules/mux/asf.c
modules/mux/asf.c
+21
-22
modules/mux/avi.c
modules/mux/avi.c
+12
-13
modules/mux/mp4.c
modules/mux/mp4.c
+46
-46
modules/mux/mpeg/pes.c
modules/mux/mpeg/pes.c
+2
-2
modules/mux/mpeg/ps.c
modules/mux/mpeg/ps.c
+17
-17
modules/mux/mpeg/ts.c
modules/mux/mpeg/ts.c
+35
-35
modules/mux/mpjpeg.c
modules/mux/mpjpeg.c
+1
-9
modules/mux/ogg.c
modules/mux/ogg.c
+43
-43
modules/mux/wav.c
modules/mux/wav.c
+1
-1
modules/packetizer/copy.c
modules/packetizer/copy.c
+1
-76
modules/packetizer/h264.c
modules/packetizer/h264.c
+5
-12
modules/packetizer/mpeg4video.c
modules/packetizer/mpeg4video.c
+2
-24
modules/packetizer/mpegvideo.c
modules/packetizer/mpegvideo.c
+3
-5
modules/stream_out/mosaic_bridge.c
modules/stream_out/mosaic_bridge.c
+1
-1
modules/stream_out/raop.c
modules/stream_out/raop.c
+1
-1
modules/stream_out/record.c
modules/stream_out/record.c
+30
-32
modules/stream_out/rtp.c
modules/stream_out/rtp.c
+16
-17
modules/stream_out/switcher.c
modules/stream_out/switcher.c
+4
-4
modules/stream_out/transcode.c
modules/stream_out/transcode.c
+13
-16
modules/stream_out/transrate/transrate.c
modules/stream_out/transrate/transrate.c
+1
-1
No files found.
modules/codec/a52.c
View file @
7b452ff3
...
...
@@ -115,7 +115,6 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
switch
(
p_dec
->
fmt_in
.
i_codec
)
{
case
VLC_CODEC_A52
:
case
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
'b'
):
i_codec
=
VLC_CODEC_A52
;
break
;
case
VLC_CODEC_EAC3
:
...
...
modules/codec/aes3.c
View file @
7b452ff3
...
...
@@ -233,7 +233,7 @@ static int Open( decoder_t *p_dec, bool b_packetizer )
{
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
FOURCC
(
'a'
,
'e'
,
's'
,
'3'
)
)
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
CODEC_302M
)
return
VLC_EGENERIC
;
/* Allocate the memory needed to store the decoder's structure */
...
...
@@ -253,7 +253,7 @@ static int Open( decoder_t *p_dec, bool b_packetizer )
/* Set callback */
if
(
b_packetizer
)
{
p_dec
->
fmt_out
.
i_codec
=
VLC_
FOURCC
(
'a'
,
'e'
,
's'
,
'3'
)
;
p_dec
->
fmt_out
.
i_codec
=
VLC_
CODEC_302M
;
p_dec
->
pf_decode_audio
=
NULL
;
p_dec
->
pf_packetize
=
Packetize
;
...
...
modules/codec/araw.c
View file @
7b452ff3
...
...
@@ -189,7 +189,6 @@ static int DecoderOpen( vlc_object_t *p_this )
case
VLC_FOURCC
(
's'
,
'o'
,
'w'
,
't'
):
case
VLC_CODEC_ALAW
:
case
VLC_FOURCC
(
'u'
,
'l'
,
'a'
,
'w'
):
case
VLC_CODEC_MULAW
:
case
VLC_CODEC_FL64
:
...
...
@@ -202,9 +201,6 @@ static int DecoderOpen( vlc_object_t *p_this )
case
VLC_CODEC_S16B
:
case
VLC_CODEC_S8
:
case
VLC_CODEC_U8
:
case
VLC_FOURCC
(
'i'
,
'n'
,
'2'
,
'4'
):
/* Quicktime in24, bigendian int24 */
case
VLC_FOURCC
(
'4'
,
'2'
,
'n'
,
'i'
):
/* Quicktime in24, little-endian int24 */
case
VLC_FOURCC
(
'i'
,
'n'
,
'3'
,
'2'
):
/* Quicktime in32, bigendian int32 */
break
;
default:
...
...
@@ -252,29 +248,12 @@ static int DecoderOpen( vlc_object_t *p_this )
p_dec
->
fmt_out
.
i_codec
=
p_dec
->
fmt_in
.
i_codec
;
p_dec
->
fmt_in
.
audio
.
i_bitspersample
=
32
;
}
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'i'
,
'n'
,
'3'
,
'2'
)
)
{
/* FIXME: mplayer uses bigendian for in24 .... but here it works
* with little endian ... weird */
p_dec
->
fmt_out
.
i_codec
=
VLC_CODEC_S32L
;
p_dec
->
fmt_in
.
audio
.
i_bitspersample
=
32
;
}
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_S24L
||
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_S24B
)
{
p_dec
->
fmt_out
.
i_codec
=
p_dec
->
fmt_in
.
i_codec
;
p_dec
->
fmt_in
.
audio
.
i_bitspersample
=
24
;
}
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'i'
,
'n'
,
'2'
,
'4'
)
)
{
p_dec
->
fmt_out
.
i_codec
=
VLC_CODEC_S24B
;
p_dec
->
fmt_in
.
audio
.
i_bitspersample
=
24
;
}
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'4'
,
'2'
,
'n'
,
'i'
)
)
{
p_dec
->
fmt_out
.
i_codec
=
VLC_CODEC_S24L
;
p_dec
->
fmt_in
.
audio
.
i_bitspersample
=
24
;
}
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_S16L
||
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_S16B
)
{
...
...
@@ -372,8 +351,7 @@ static int DecoderOpen( vlc_object_t *p_this )
p_sys
->
p_logtos16
=
alawtos16
;
p_dec
->
fmt_in
.
audio
.
i_bitspersample
=
8
;
}
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'u'
,
'l'
,
'a'
,
'w'
)
||
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_MULAW
)
else
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_MULAW
)
{
p_dec
->
fmt_out
.
i_codec
=
AOUT_FMT_S16_NE
;
p_sys
->
p_logtos16
=
ulawtos16
;
...
...
@@ -397,7 +375,6 @@ static int DecoderOpen( vlc_object_t *p_this )
p_dec
->
fmt_in
.
audio
.
i_original_channels
;
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_ALAW
||
p_dec
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'u'
,
'l'
,
'a'
,
'w'
)
||
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_MULAW
)
{
p_dec
->
fmt_out
.
audio
.
i_bitspersample
=
16
;
...
...
@@ -1381,7 +1358,6 @@ static int EncoderOpen( vlc_object_t *p_this )
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_U8
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_S8
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_ALAW
||
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'u'
,
'l'
,
'a'
,
'w'
)
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_MULAW
)
{
p_enc
->
fmt_out
.
audio
.
i_bitspersample
=
8
;
...
...
@@ -1396,8 +1372,7 @@ static int EncoderOpen( vlc_object_t *p_this )
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_U24L
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_U24B
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_S24L
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_S24B
||
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'i'
,
'n'
,
'2'
,
'4'
)
)
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_S24B
)
{
p_enc
->
fmt_out
.
audio
.
i_bitspersample
=
24
;
}
...
...
@@ -1405,7 +1380,6 @@ static int EncoderOpen( vlc_object_t *p_this )
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_U32B
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_S32L
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_S32B
||
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'i'
,
'n'
,
'3'
,
'2'
)
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_FI32
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_FL32
)
{
...
...
@@ -1435,8 +1409,7 @@ static int EncoderOpen( vlc_object_t *p_this )
p_enc
->
fmt_in
.
i_codec
=
AOUT_FMT_S16_NE
;
p_sys
->
i_s16tolog
=
ALAW
;
}
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_FOURCC
(
'u'
,
'l'
,
'a'
,
'w'
)
||
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_MULAW
)
else
if
(
p_enc
->
fmt_out
.
i_codec
==
VLC_CODEC_MULAW
)
{
p_enc
->
fmt_in
.
audio
.
i_bitspersample
=
16
;
p_enc
->
fmt_in
.
i_codec
=
AOUT_FMT_S16_NE
;
...
...
modules/codec/avcodec/video.c
View file @
7b452ff3
...
...
@@ -195,7 +195,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context,
p_sys
->
b_delayed_open
=
true
;
/* ***** Fill p_context with init values ***** */
p_sys
->
p_context
->
codec_tag
=
ffmpeg_CodecTag
(
p_dec
->
fmt_in
.
i_codec
);
p_sys
->
p_context
->
codec_tag
=
ffmpeg_CodecTag
(
p_dec
->
fmt_in
.
i_original_fourcc
?:
p_dec
->
fmt_in
.
i_codec
);
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys
->
p_context
->
workaround_bugs
=
...
...
modules/codec/cmml/cmml.c
View file @
7b452ff3
...
...
@@ -93,7 +93,7 @@ static int OpenDecoder( vlc_object_t *p_this )
input_thread_t
*
p_input
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
FOURCC
(
'c'
,
'm'
,
'm'
,
'l'
)
)
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
CODEC_CMML
)
return
VLC_EGENERIC
;
p_dec
->
pf_decode_sub
=
DecodeBlock
;
...
...
modules/codec/cvdsub.c
View file @
7b452ff3
...
...
@@ -111,10 +111,8 @@ static int DecoderOpen( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'c'
,
'v'
,
'd'
,
' '
)
)
{
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_CVD
)
return
VLC_EGENERIC
;
}
p_dec
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
decoder_sys_t
)
);
if
(
!
p_sys
)
...
...
modules/codec/dmo/dmo.c
View file @
7b452ff3
...
...
@@ -184,42 +184,29 @@ typedef struct
static
const
codec_dll
decoders_table
[]
=
{
/* WVC1 */
{
VLC_FOURCC
(
'W'
,
'V'
,
'C'
,
'1'
),
"wvc1dmod.dll"
,
&
guid_wvc1
},
{
VLC_FOURCC
(
'w'
,
'v'
,
'c'
,
'1'
),
"wvc1dmod.dll"
,
&
guid_wvc1
},
{
VLC_CODEC_VC1
,
"wvc1dmod.dll"
,
&
guid_wvc1
},
/* WMV3 */
{
VLC_CODEC_WMV3
,
"wmv9dmod.dll"
,
&
guid_wmv9
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'3'
),
"wmv9dmod.dll"
,
&
guid_wmv9
},
{
VLC_FOURCC
(
'W'
,
'M'
,
'V'
,
'P'
),
"wmv9dmod.dll"
,
&
guid_wmv9
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'p'
),
"wmv9dmod.dll"
,
&
guid_wmv9
},
{
VLC_CODEC_WMV3
,
"wmv9dmod.dll"
,
&
guid_wmv9
},
/* WMV2 */
{
VLC_CODEC_WMV2
,
"wmvdmod.dll"
,
&
guid_wmv
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'2'
),
"wmvdmod.dll"
,
&
guid_wmv
},
{
VLC_CODEC_WMV2
,
"wmvdmod.dll"
,
&
guid_wmv
},
/* WMV1 */
{
VLC_CODEC_WMV1
,
"wmvdmod.dll"
,
&
guid_wmv
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'1'
),
"wmvdmod.dll"
,
&
guid_wmv
},
{
VLC_CODEC_WMV1
,
"wmvdmod.dll"
,
&
guid_wmv
},
/* Screen codecs */
{
VLC_FOURCC
(
'M'
,
'S'
,
'S'
,
'2'
),
"wmsdmod.dll"
,
&
guid_wms
},
{
VLC_FOURCC
(
'm'
,
's'
,
's'
,
'2'
),
"wmsdmod.dll"
,
&
guid_wms
},
{
VLC_FOURCC
(
'M'
,
'S'
,
'S'
,
'1'
),
"wmsdmod.dll"
,
&
guid_wms
},
{
VLC_FOURCC
(
'm'
,
's'
,
's'
,
'1'
),
"wmsdmod.dll"
,
&
guid_wms
},
/* Windows Media Video Adv */
{
VLC_FOURCC
(
'W'
,
'M'
,
'V'
,
'A'
),
"wmvadvd.dll"
,
&
guid_wmva
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'a'
),
"wmvadvd.dll"
,
&
guid_wmva
},
{
VLC_FOURCC
(
'W'
,
'V'
,
'P'
,
'2'
),
"wmvadvd.dll"
,
&
guid_wmva
},
{
VLC_FOURCC
(
'w'
,
'v'
,
'p'
,
'2'
),
"wmvadvd.dll"
,
&
guid_wmva
},
{
VLC_CODEC_WMVA
,
"wmvadvd.dll"
,
&
guid_wmva
},
/* WMA 3 */
{
VLC_FOURCC
(
'W'
,
'M'
,
'A'
,
'3'
),
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'3'
),
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_CODEC_WMAP
,
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'p'
),
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_CODEC_WMA3
,
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_CODEC_WMAP
,
"wma9dmod.dll"
,
&
guid_wma9
},
/* WMA 2 */
{
VLC_CODEC_WMA2
,
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'2'
),
"wma9dmod.dll"
,
&
guid_wma9
},
{
VLC_CODEC_WMA2
,
"wma9dmod.dll"
,
&
guid_wma9
},
/* WMA Speech */
{
VLC_CODEC_WMAS
,
"wmspdmod.dll"
,
&
guid_wma
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
's'
),
"wmspdmod.dll"
,
&
guid_wma
},
{
VLC_CODEC_WMAS
,
"wmspdmod.dll"
,
&
guid_wma
},
/* */
{
0
,
NULL
,
NULL
}
...
...
@@ -229,20 +216,15 @@ static const codec_dll encoders_table[] =
{
/* WMV3 */
{
VLC_CODEC_WMV3
,
"wmvdmoe2.dll"
,
&
guid_wmv_enc2
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'3'
),
"wmvdmoe2.dll"
,
&
guid_wmv_enc2
},
/* WMV2 */
{
VLC_CODEC_WMV2
,
"wmvdmoe2.dll"
,
&
guid_wmv_enc2
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'2'
),
"wmvdmoe2.dll"
,
&
guid_wmv_enc2
},
/* WMV1 */
{
VLC_CODEC_WMV1
,
"wmvdmoe2.dll"
,
&
guid_wmv_enc2
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'v'
,
'1'
),
"wmvdmoe2.dll"
,
&
guid_wmv_enc2
},
/* WMA 3 */
{
VLC_FOURCC
(
'W'
,
'M'
,
'A'
,
'3'
),
"wmadmoe.dll"
,
&
guid_wma_enc
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'3'
),
"wmadmoe.dll"
,
&
guid_wma_enc
},
{
VLC_CODEC_WMA3
,
"wmadmoe.dll"
,
&
guid_wma_enc
},
/* WMA 2 */
{
VLC_CODEC_WMA2
,
"wmadmoe.dll"
,
&
guid_wma_enc
},
{
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'2'
),
"wmadmoe.dll"
,
&
guid_wma_enc
},
/* */
{
0
,
NULL
,
NULL
}
...
...
@@ -403,7 +385,7 @@ static int DecOpen( decoder_t *p_dec )
dmo_input_type
.
majortype
=
MEDIATYPE_Audio
;
dmo_input_type
.
subtype
=
dmo_input_type
.
majortype
;
dmo_input_type
.
subtype
.
Data1
=
p_dec
->
fmt_in
.
i_codec
;
dmo_input_type
.
subtype
.
Data1
=
p_dec
->
fmt_in
.
i_original_fourcc
?:
p_dec
->
fmt_in
.
i_codec
;
fourcc_to_wf_tag
(
p_dec
->
fmt_in
.
i_codec
,
&
i_tag
);
if
(
i_tag
)
dmo_input_type
.
subtype
.
Data1
=
i_tag
;
...
...
@@ -434,7 +416,7 @@ static int DecOpen( decoder_t *p_dec )
memcpy
(
&
p_vih
[
1
],
p_dec
->
fmt_in
.
p_extra
,
p_dec
->
fmt_in
.
i_extra
);
p_bih
=
&
p_vih
->
bmiHeader
;
p_bih
->
biCompression
=
p_dec
->
fmt_in
.
i_codec
;
p_bih
->
biCompression
=
p_dec
->
fmt_in
.
i_original_fourcc
?:
p_dec
->
fmt_in
.
i_codec
;
p_bih
->
biWidth
=
p_dec
->
fmt_in
.
video
.
i_width
;
p_bih
->
biHeight
=
p_dec
->
fmt_in
.
video
.
i_height
;
p_bih
->
biBitCount
=
p_dec
->
fmt_in
.
video
.
i_bits_per_pixel
;
...
...
@@ -449,7 +431,7 @@ static int DecOpen( decoder_t *p_dec )
dmo_input_type
.
majortype
=
MEDIATYPE_Video
;
dmo_input_type
.
subtype
=
dmo_input_type
.
majortype
;
dmo_input_type
.
subtype
.
Data1
=
p_dec
->
fmt_in
.
i_codec
;
dmo_input_type
.
subtype
.
Data1
=
p_dec
->
fmt_in
.
i_original_fourcc
?:
p_dec
->
fmt_in
.
i_codec
dmo_input_type
.
formattype
=
FORMAT_VideoInfo
;
dmo_input_type
.
bFixedSizeSamples
=
0
;
dmo_input_type
.
bTemporalCompression
=
1
;
...
...
@@ -681,7 +663,7 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
uint16_t
i_tag
;
dmo_partial_type
.
type
=
MEDIATYPE_Audio
;
dmo_partial_type
.
subtype
=
dmo_partial_type
.
type
;
dmo_partial_type
.
subtype
.
Data1
=
p_fmt
->
i_codec
;
dmo_partial_type
.
subtype
.
Data1
=
p_fmt
->
i_original_fourcc
?:
p_fmt
->
i_codec
;
fourcc_to_wf_tag
(
p_fmt
->
i_codec
,
&
i_tag
);
if
(
i_tag
)
dmo_partial_type
.
subtype
.
Data1
=
i_tag
;
}
...
...
@@ -689,7 +671,7 @@ static int LoadDMO( vlc_object_t *p_this, HINSTANCE *p_hmsdmo_dll,
{
dmo_partial_type
.
type
=
MEDIATYPE_Video
;
dmo_partial_type
.
subtype
=
dmo_partial_type
.
type
;
dmo_partial_type
.
subtype
.
Data1
=
p_fmt
->
i_codec
;
dmo_partial_type
.
subtype
.
Data1
=
p_fmt
->
i_original_fourcc
?:
p_fmt
->
i_codec
;
}
#ifndef LOADER
...
...
modules/codec/dts.c
View file @
7b452ff3
...
...
@@ -140,11 +140,8 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_DTS
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'd'
,
't'
,
's'
,
'b'
)
)
{
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_DTS
)
return
VLC_EGENERIC
;
}
/* Allocate the memory needed to store the decoder's structure */
if
(
(
p_dec
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
*
p_sys
))
)
==
NULL
)
...
...
modules/codec/dvbsub.c
View file @
7b452ff3
...
...
@@ -1537,7 +1537,7 @@ static subpicture_t *render( decoder_t *p_dec )
continue
;
}
/* FIXME: don't create a subpicture region with VLC
_FOURC
C YUVP
/* FIXME: don't create a subpicture region with VLC
CODE
C YUVP
* when it actually is a TEXT region */
/* Create new SPU region */
...
...
modules/codec/kate.c
View file @
7b452ff3
...
...
@@ -346,7 +346,7 @@ static int OpenDecoder( vlc_object_t *p_this )
decoder_sys_t
*
p_sys
;
int
i_ret
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
FOURCC
(
'k'
,
'a'
,
't'
,
'e'
)
)
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
CODEC_KATE
)
{
return
VLC_EGENERIC
;
}
...
...
@@ -450,7 +450,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
if
(
i_ret
==
VLC_SUCCESS
)
{
p_dec
->
p_sys
->
b_packetizer
=
true
;
p_dec
->
fmt_out
.
i_codec
=
VLC_
FOURCC
(
'k'
,
'a'
,
't'
,
'e'
)
;
p_dec
->
fmt_out
.
i_codec
=
VLC_
CODEC_KATE
;
}
return
i_ret
;
...
...
modules/codec/libmpeg2.c
View file @
7b452ff3
...
...
@@ -119,15 +119,21 @@ static int OpenDecoder( vlc_object_t *p_this )
decoder_sys_t
*
p_sys
;
uint32_t
i_accel
=
0
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_MPGV
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'1'
)
&&
/* Pinnacle hardware-mpeg1 */
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'P'
,
'I'
,
'M'
,
'1'
)
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_MP2V
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'2'
)
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'h'
,
'd'
,
'v'
,
'2'
)
)
{
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_MPGV
)
return
VLC_EGENERIC
;
/* Select onl recognized original format (standard mpeg video) */
switch
(
p_dec
->
fmt_in
.
i_original_fourcc
)
{
case
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'1'
):
case
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'2'
):
case
VLC_FOURCC
(
'm'
,
'p'
,
'g'
,
'v'
):
case
VLC_FOURCC
(
'P'
,
'I'
,
'M'
,
'1'
):
case
VLC_FOURCC
(
'h'
,
'd'
,
'v'
,
'2'
):
break
;
default:
if
(
p_dec
->
fmt_in
.
i_original_fourcc
)
return
VLC_EGENERIC
;
break
;
}
/* Allocate the memory needed to store the decoder's structure */
...
...
modules/codec/lpcm.c
View file @
7b452ff3
...
...
@@ -132,7 +132,6 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer )
{
/* DVD LPCM */
case
VLC_CODEC_DVD_LPCM
:
case
VLC_FOURCC
(
'l'
,
'p'
,
'c'
,
'b'
):
b_dvd
=
true
;
break
;
/* BD LPCM */
...
...
modules/codec/mash.cpp
View file @
7b452ff3
...
...
@@ -87,7 +87,6 @@ static int OpenDecoder( vlc_object_t *p_this )
{
/* Planar YUV */
case
VLC_CODEC_H261
:
case
VLC_FOURCC
(
'H'
,
'2'
,
'6'
,
'1'
):
break
;
default:
...
...
modules/codec/quicktime.c
View file @
7b452ff3
...
...
@@ -245,27 +245,21 @@ static int Open( vlc_object_t *p_this )
switch
(
p_dec
->
fmt_in
.
i_codec
)
{
case
VLC_CODEC_H264
:
/* H.264 */
case
VLC_
FOURCC
(
'c'
,
'v'
,
'i'
,
'd'
):
/* Cinepak */
case
VLC_CODEC_H264
:
case
VLC_
CODEC_CINEPAK
:
case
VLC_FOURCC
(
'I'
,
'V'
,
'4'
,
'1'
):
/* Indeo Video IV */
case
VLC_FOURCC
(
'i'
,
'v'
,
'4'
,
'1'
):
/* dto. */
#ifdef __APPLE__
case
VLC_FOURCC
(
'p'
,
'x'
,
'l'
,
't'
):
/* Pixlet */
#endif
case
VLC_FOURCC
(
'd'
,
'v'
,
'1'
,
'n'
):
/* DVC Pro 100 NTSC */
case
VLC_FOURCC
(
'd'
,
'v'
,
'1'
,
'p'
):
/* DVC Pro 100 PAL */
case
VLC_FOURCC
(
'd'
,
'v'
,
'h'
,
'p'
):
/* DVC PRO HD 720p */
case
VLC_FOURCC
(
'd'
,
'v'
,
'h'
,
'6'
):
/* DVC PRO HD 1080i 60 */
case
VLC_FOURCC
(
'd'
,
'v'
,
'h'
,
'5'
):
/* DVC PRO HD 1080i 50 */
case
VLC_CODEC_DV
:
case
VLC_CODEC_SVQ3
:
/* Sorenson v3 */
/* case VLC_CODEC_SVQ1: Sorenson v1
case VLC_FOURCC('Z','y','G','o'):
case VLC_FOURCC('V','P','3','1'):
case VLC_FOURCC('3','I','V','1'): */
case
VLC_CODEC_QTRLE
:
/* QuickTime animation (RLE) */
case
VLC_CODEC_RPZA
:
/* QuickTime Apple Video */
case
VLC_FOURCC
(
'a'
,
'z'
,
'p'
,
'r'
):
/* QuickTime animation (RLE) */
case
VLC_CODEC_QTRLE
:
case
VLC_CODEC_RPZA
:
#ifdef LOADER
p_dec
->
p_sys
=
NULL
;
p_dec
->
pf_decode_video
=
DecodeVideo
;
...
...
@@ -394,7 +388,10 @@ static int OpenAudio( decoder_t *p_dec )
p_dec
->
p_sys
=
p_sys
;
p_dec
->
pf_decode_audio
=
DecodeAudio
;
memcpy
(
fcc
,
&
p_dec
->
fmt_in
.
i_codec
,
4
);
if
(
p_dec
->
fmt_in
.
i_original_fourcc
)
memcpy
(
fcc
,
&
p_dec
->
fmt_in
.
i_original_fourcc
,
4
);
else
memcpy
(
fcc
,
&
p_dec
->
fmt_in
.
i_codec
,
4
);
#ifdef __APPLE__
EnterMovies
();
...
...
@@ -694,7 +691,11 @@ static int OpenVideo( decoder_t *p_dec )
return
VLC_EGENERIC
;
}
memcpy
(
fcc
,
&
p_dec
->
fmt_in
.
i_codec
,
4
);
if
(
p_dec
->
fmt_in
.
i_original_fourcc
)
memcpy
(
fcc
,
&
p_dec
->
fmt_in
.
i_original_fourcc
,
4
);
else
memcpy
(
fcc
,
&
p_dec
->
fmt_in
.
i_codec
,
4
);
msg_Dbg
(
p_dec
,
"quicktime_video %4.4s %dx%d"
,
fcc
,
p_dec
->
fmt_in
.
video
.
i_width
,
p_dec
->
fmt_in
.
video
.
i_height
);
...
...
modules/codec/rawvideo.c
View file @
7b452ff3
...
...
@@ -96,32 +96,24 @@ static int OpenDecoder( vlc_object_t *p_this )
case
VLC_CODEC_I422
:
case
VLC_CODEC_I420
:
case
VLC_CODEC_YV12
:
case
VLC_FOURCC
(
'I'
,
'Y'
,
'U'
,
'V'
):
case
VLC_CODEC_I411
:
case
VLC_CODEC_I410
:
case
VLC_FOURCC
(
'Y'
,
'V'
,
'U'
,
'9'
):
case
VLC_FOURCC
(
'Y'
,
'4'
,
'2'
,
'B'
):
case
VLC_FOURCC
(
'Y'
,
'4'
,
'1'
,
'B'
):
case
VLC_CODEC_GREY
:
case
VLC_CODEC_YUVP
:
/* Packed YUV */
case
VLC_CODEC_YUYV
:
case
VLC_
FOURCC
(
'Y'
,
'8'
,
'0'
,
'0'
)
:
case
VLC_
CODEC_YVYU
:
case
VLC_CODEC_UYVY
:
case
VLC_
FOURCC
(
'H'
,
'D'
,
'Y'
,
'C'
)
:
case
VLC_
CODEC_VYUY
:
/* RGB */
case
VLC_CODEC_RGB32
:
case
VLC_CODEC_RGB24
:
case
VLC_CODEC_RGB16
:
case
VLC_CODEC_RGB15
:
break
;
case
VLC_FOURCC
(
'2'
,
'V'
,
'u'
,
'y'
):
case
VLC_FOURCC
(
'2'
,
'v'
,
'u'
,
'y'
):
case
VLC_FOURCC
(
'A'
,
'V'
,
'U'
,
'I'
):
p_dec
->
fmt_in
.
i_codec
=
VLC_CODEC_UYVY
;
break
;
case
VLC_FOURCC
(
'y'
,
'v'
,
'1'
,
'2'
):
p_dec
->
fmt_in
.
i_codec
=
VLC_CODEC_YV12
;
case
VLC_CODEC_RGB8
:
case
VLC_CODEC_RGBP
:
break
;
default:
...
...
modules/codec/speex.c
View file @
7b452ff3
...
...
@@ -205,11 +205,8 @@ static int OpenDecoder( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
=
p_dec
->
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_SPEEX
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
's'
,
'p'
,
'x'
,
'r'
)
)
{
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_SPEEX
)
return
VLC_EGENERIC
;
}
/* Allocate the memory needed to store the decoder's structure */
if
(
(
p_dec
->
p_sys
=
p_sys
=
...
...
@@ -231,7 +228,7 @@ static int OpenDecoder( vlc_object_t *p_this )
being invoked on a Speex stream arriving via RTP.
A special decoder callback is used.
*/
if
(
p_dec
->
fmt_in
.
i_
code
c
==
VLC_FOURCC
(
's'
,
'p'
,
'x'
,
'r'
))
if
(
p_dec
->
fmt_in
.
i_
original_fourc
c
==
VLC_FOURCC
(
's'
,
'p'
,
'x'
,
'r'
))
{
msg_Dbg
(
p_dec
,
"Using RTP version of Speex decoder @ rate %d."
,
p_dec
->
fmt_in
.
audio
.
i_rate
);
...
...
modules/codec/spudec/spudec.c
View file @
7b452ff3
...
...
@@ -73,11 +73,8 @@ static int DecoderOpen( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_SPU
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
's'
,
'p'
,
'u'
,
'b'
)
)
{
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_SPU
)
return
VLC_EGENERIC
;
}
p_dec
->
p_sys
=
p_sys
=
malloc
(
sizeof
(
decoder_sys_t
)
);
...
...
modules/codec/subtitles/subsdec.c
View file @
7b452ff3
...
...
@@ -234,7 +234,7 @@ static int OpenDecoder( vlc_object_t *p_this )
{
case
VLC_CODEC_SUBT
:
case
VLC_CODEC_SSA
:
case
VLC_
FOURCC
(
't'
,
'1'
,
'4'
,
'0'
)
:
case
VLC_
CODEC_ITU_T140
:
break
;
default:
return
VLC_EGENERIC
;
...
...
@@ -262,7 +262,7 @@ static int OpenDecoder( vlc_object_t *p_this )
char
*
psz_charset
=
NULL
;
/* First try demux-specified encoding */
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_
FOURCC
(
't'
,
'1'
,
'4'
,
'0'
)
)
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_
CODEC_ITU_T140
)
psz_charset
=
strdup
(
"UTF-8"
);
/* IUT T.140 is always using UTF-8 */
else
if
(
p_dec
->
fmt_in
.
subs
.
psz_encoding
&&
*
p_dec
->
fmt_in
.
subs
.
psz_encoding
)
...
...
modules/codec/subtitles/subsusf.c
View file @
7b452ff3
...
...
@@ -68,7 +68,7 @@ static int OpenDecoder( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
FOURCC
(
'u'
,
's'
,
'f'
,
' '
)
)
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_
CODEC_USF
)
return
VLC_EGENERIC
;
/* Allocate the memory needed to store the decoder's structure */
...
...
modules/codec/subtitles/t140.c
View file @
7b452ff3
...
...
@@ -57,14 +57,14 @@ static int Open( vlc_object_t *p_this )
msg_Err
(
p_this
,
"Only UTF-8 encoding supported"
);
return
VLC_EGENERIC
;
}
case
VLC_
FOURCC
(
't'
,
'1'
,
'4'
,
'0'
)
:
case
VLC_
CODEC_ITU_T140
:
break
;
default:
if
(
!
p_enc
->
b_force
)
return
VLC_EGENERIC
;
p_enc
->
fmt_out
.
i_codec
=
VLC_
FOURCC
(
't'
,
'1'
,
'4'
,
'0'
)
;
p_enc
->
fmt_out
.
i_codec
=
VLC_
CODEC_ITU_T140
;
}
p_enc
->
p_sys
=
NULL
;
...
...
modules/codec/svcdsub.c
View file @
7b452ff3
...
...
@@ -142,10 +142,8 @@ static int DecoderOpen( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'o'
,
'g'
,
't'
,
' '
)
)
{
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_OGT
)
return
VLC_EGENERIC
;
}
p_dec
->
p_sys
=
p_sys
=
calloc
(
1
,
sizeof
(
decoder_sys_t
)
);
if
(
p_sys
==
NULL
)
...
...
@@ -158,7 +156,7 @@ static int DecoderOpen( vlc_object_t *p_this )
p_sys
->
i_state
=
SUBTITLE_BLOCK_EMPTY
;
p_sys
->
p_spu
=
NULL
;
es_format_Init
(
&
p_dec
->
fmt_out
,
SPU_ES
,
VLC_
FOURCC
(
'o'
,
'g'
,
't'
,
' '
)
);
es_format_Init
(
&
p_dec
->
fmt_out
,
SPU_ES
,
VLC_
CODEC_OGT
);
p_dec
->
pf_decode_sub
=
Decode
;
p_dec
->
pf_packetize
=
Packetize
;
...
...
modules/codec/wmafixed/wma.c
View file @
7b452ff3
...
...
@@ -119,9 +119,7 @@ static int OpenDecoder( vlc_object_t *p_this )
decoder_t
*
p_dec
=
(
decoder_t
*
)
p_this
;
decoder_sys_t
*
p_sys
;
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'1'
)
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_WMA1
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'2'
)
&&
if
(
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_WMA1
&&
p_dec
->
fmt_in
.
i_codec
!=
VLC_CODEC_WMA2
)
{
return
VLC_EGENERIC
;
...
...
@@ -166,11 +164,9 @@ static int OpenDecoder( vlc_object_t *p_this )
wfx
.
rate
,
wfx
.
bitrate
,
wfx
.
channels
,
wfx
.
blockalign
,
wfx
.
bitspersample
);
if
(
p_dec
->
fmt_in
.
i_codec
==
VLC_FOURCC
(
'w'
,
'm'
,
'a'
,
'1'
)
||
p_dec
->
fmt_in
.
i_codec
==
VLC_CODEC_WMA1
)
if
(
p_dec
->
fmt_in