Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
74912d2f
Commit
74912d2f
authored
Mar 09, 2003
by
Jon Lech Johansen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* ./modules/demux/mpeg: DTS support.
parent
1d5118e0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
3 deletions
+36
-3
include/input_ext-intf.h
include/input_ext-intf.h
+2
-1
modules/demux/mpeg/ps.c
modules/demux/mpeg/ps.c
+15
-1
modules/demux/mpeg/system.c
modules/demux/mpeg/system.c
+19
-1
No files found.
include/input_ext-intf.h
View file @
74912d2f
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* control the pace of reading.
* control the pace of reading.
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
* Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.8
5 2003/02/08 22:20:28 massiot
Exp $
* $Id: input_ext-intf.h,v 1.8
6 2003/03/09 23:39:05 jlj
Exp $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
...
@@ -33,6 +33,7 @@
...
@@ -33,6 +33,7 @@
#define REQUESTED_MPEG 1
#define REQUESTED_MPEG 1
#define REQUESTED_A52 2
#define REQUESTED_A52 2
#define REQUESTED_LPCM 3
#define REQUESTED_LPCM 3
#define REQUESTED_DTS 4
#define REQUESTED_NOAUDIO 255
#define REQUESTED_NOAUDIO 255
#define OFFSETTOTIME_MAX_SIZE 10
#define OFFSETTOTIME_MAX_SIZE 10
...
...
modules/demux/mpeg/ps.c
View file @
74912d2f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* ps.c : Program Stream input module for vlc
* ps.c : Program Stream input module for vlc
*****************************************************************************
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* Copyright (C) 2000-2001 VideoLAN
* $Id: ps.c,v 1.
8 2003/03/03 14:19:09 massiot
Exp $
* $Id: ps.c,v 1.
9 2003/03/09 23:39:05 jlj
Exp $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
*
...
@@ -223,6 +223,20 @@ static int Activate( vlc_object_t * p_this )
...
@@ -223,6 +223,20 @@ static int Activate( vlc_object_t * p_this )
}
}
break
;
break
;
case
VLC_FOURCC
(
'd'
,
't'
,
's'
,
' '
):
case
VLC_FOURCC
(
'd'
,
't'
,
's'
,
'b'
):
if
(
config_GetInt
(
p_input
,
"audio-channel"
)
==
((
p_es
->
i_id
&
0x700
)
>>
8
)
||
(
config_GetInt
(
p_input
,
"audio-channel"
)
<
0
&&
!
((
p_es
->
i_id
&
0x700
)
>>
8
)
)
)
switch
(
config_GetInt
(
p_input
,
"audio-type"
)
)
{
case
-
1
:
case
REQUESTED_DTS
:
input_SelectES
(
p_input
,
p_es
);
}
break
;
case
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
' '
):
case
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
' '
):
case
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
'b'
):
case
VLC_FOURCC
(
'a'
,
'5'
,
'2'
,
'b'
):
if
(
config_GetInt
(
p_input
,
"audio-channel"
)
if
(
config_GetInt
(
p_input
,
"audio-channel"
)
...
...
modules/demux/mpeg/system.c
View file @
74912d2f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* system.c: helper module for TS, PS and PES management
* system.c: helper module for TS, PS and PES management
*****************************************************************************
*****************************************************************************
* Copyright (C) 1998-2002 VideoLAN
* Copyright (C) 1998-2002 VideoLAN
* $Id: system.c,v 1.1
0 2003/02/08 19:10:21 massiot
Exp $
* $Id: system.c,v 1.1
1 2003/03/09 23:39:05 jlj
Exp $
*
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
* Michel Lespinasse <walken@via.ecp.fr>
...
@@ -875,6 +875,24 @@ static es_descriptor_t * ParsePS( input_thread_t * p_input,
...
@@ -875,6 +875,24 @@ static es_descriptor_t * ParsePS( input_thread_t * p_input,
case
REQUESTED_MPEG
:
case
REQUESTED_MPEG
:
input_SelectES
(
p_input
,
p_es
);
input_SelectES
(
p_input
,
p_es
);
}
}
#endif
}
else
if
(
(
i_id
&
0xF8FF
)
==
0x88BD
)
{
p_es
->
i_fourcc
=
VLC_FOURCC
(
'd'
,
't'
,
's'
,
'b'
);
p_es
->
i_cat
=
AUDIO_ES
;
#ifdef AUTO_SPAWN
if
(
!
p_input
->
stream
.
b_seekable
)
if
(
config_GetInt
(
p_input
,
"audio-channel"
)
==
((
p_es
->
i_id
&
0x700
)
>>
8
)
||
(
config_GetInt
(
p_input
,
"audio-channel"
)
<
0
&&
!
((
p_es
->
i_id
&
0x700
)
>>
8
))
)
switch
(
config_GetInt
(
p_input
,
"audio-type"
)
)
{
case
-
1
:
case
REQUESTED_DTS
:
input_SelectES
(
p_input
,
p_es
);
}
#endif
#endif
}
}
else
if
(
(
i_id
&
0xF0FF
)
==
0x80BD
)
else
if
(
(
i_id
&
0xF0FF
)
==
0x80BD
)
...
...
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