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
496fab1d
Commit
496fab1d
authored
Feb 10, 2012
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use unsigned type
i_prog takes its value from i_num_pmt which can't be negative, nor > 64
parent
2a9a62e5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
modules/mux/mpeg/ts.c
modules/mux/mpeg/ts.c
+10
-10
No files found.
modules/mux/mpeg/ts.c
View file @
496fab1d
...
@@ -228,7 +228,7 @@ static const char *const ppsz_sout_options[] = {
...
@@ -228,7 +228,7 @@ static const char *const ppsz_sout_options[] = {
typedef
struct
pmt_map_t
/* Holds the mapping between the pmt-pid/pmt table */
typedef
struct
pmt_map_t
/* Holds the mapping between the pmt-pid/pmt table */
{
{
int
i_pid
;
int
i_pid
;
unsigned
long
i_prog
;
unsigned
i_prog
;
}
pmt_map_t
;
}
pmt_map_t
;
typedef
struct
sdt_desc_t
typedef
struct
sdt_desc_t
...
@@ -349,7 +349,7 @@ struct sout_mux_sys_t
...
@@ -349,7 +349,7 @@ struct sout_mux_sys_t
int
i_tsid
;
int
i_tsid
;
int
i_netid
;
int
i_netid
;
int
i_num_pmt
;
unsigned
i_num_pmt
;
int
i_pmtslots
;
int
i_pmtslots
;
int
i_pat_version_number
;
int
i_pat_version_number
;
ts_stream_t
pat
;
ts_stream_t
pat
;
...
@@ -599,7 +599,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -599,7 +599,7 @@ static int Open( vlc_object_t *p_this )
p_sys
->
i_netid
=
val
.
i_int
;
p_sys
->
i_netid
=
val
.
i_int
;
p_sys
->
i_pmt_version_number
=
nrand48
(
subi
)
&
0x1f
;
p_sys
->
i_pmt_version_number
=
nrand48
(
subi
)
&
0x1f
;
for
(
int
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
{
{
p_sys
->
pmt
[
i
].
i_continuity_counter
=
0
;
p_sys
->
pmt
[
i
].
i_continuity_counter
=
0
;
p_sys
->
pmt
[
i
].
b_discontinuity
=
false
;
p_sys
->
pmt
[
i
].
b_discontinuity
=
false
;
...
@@ -673,14 +673,14 @@ static int Open( vlc_object_t *p_this )
...
@@ -673,14 +673,14 @@ static int Open( vlc_object_t *p_this )
else
else
{
{
/* Option not specified, use 1, 2, 3... */
/* Option not specified, use 1, 2, 3... */
for
(
int
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
p_sys
->
i_pmt_program_number
[
i
]
=
i
+
1
;
p_sys
->
i_pmt_program_number
[
i
]
=
i
+
1
;
}
}
var_Get
(
p_mux
,
SOUT_CFG_PREFIX
"pid-pmt"
,
&
val
);
var_Get
(
p_mux
,
SOUT_CFG_PREFIX
"pid-pmt"
,
&
val
);
if
(
!
val
.
i_int
)
/* Does this make any sense? */
if
(
!
val
.
i_int
)
/* Does this make any sense? */
val
.
i_int
=
0x42
;
val
.
i_int
=
0x42
;
for
(
int
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
p_sys
->
pmt
[
i
].
i_pid
=
val
.
i_int
+
i
;
p_sys
->
pmt
[
i
].
i_pid
=
val
.
i_int
+
i
;
p_sys
->
i_pid_free
=
p_sys
->
pmt
[
p_sys
->
i_num_pmt
-
1
].
i_pid
+
1
;
p_sys
->
i_pid_free
=
p_sys
->
pmt
[
p_sys
->
i_num_pmt
-
1
].
i_pid
+
1
;
...
@@ -2048,7 +2048,7 @@ static void GetPAT( sout_mux_t *p_mux,
...
@@ -2048,7 +2048,7 @@ static void GetPAT( sout_mux_t *p_mux,
dvbpsi_InitPAT
(
&
pat
,
p_sys
->
i_tsid
,
p_sys
->
i_pat_version_number
,
dvbpsi_InitPAT
(
&
pat
,
p_sys
->
i_tsid
,
p_sys
->
i_pat_version_number
,
1
);
/* b_current_next */
1
);
/* b_current_next */
/* add all programs */
/* add all programs */
for
(
int
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
dvbpsi_PATAddProgram
(
&
pat
,
p_sys
->
i_pmt_program_number
[
i
],
dvbpsi_PATAddProgram
(
&
pat
,
p_sys
->
i_pmt_program_number
[
i
],
p_sys
->
pmt
[
i
].
i_pid
);
p_sys
->
pmt
[
i
].
i_pid
);
...
@@ -2223,7 +2223,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
...
@@ -2223,7 +2223,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
if
(
p_sys
->
b_sdt
)
if
(
p_sys
->
b_sdt
)
dvbpsi_InitSDT
(
&
sdt
,
p_sys
->
i_tsid
,
1
,
1
,
p_sys
->
i_netid
);
dvbpsi_InitSDT
(
&
sdt
,
p_sys
->
i_tsid
,
1
,
1
,
p_sys
->
i_netid
);
for
(
int
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
{
{
dvbpsi_InitPMT
(
&
p_sys
->
dvbpmt
[
i
],
dvbpsi_InitPMT
(
&
p_sys
->
dvbpmt
[
i
],
p_sys
->
i_pmt_program_number
[
i
],
/* program number */
p_sys
->
i_pmt_program_number
[
i
],
/* program number */
...
@@ -2282,8 +2282,8 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
...
@@ -2282,8 +2282,8 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
p_stream
->
i_stream_type
,
p_stream
->
i_pid
);
p_stream
->
i_stream_type
,
p_stream
->
i_pid
);
else
else
/* If there's an error somewhere, dump it to the first pmt */
/* If there's an error somewhere, dump it to the first pmt */
p_es
=
dvbpsi_PMTAddES
(
&
p_sys
->
dvbpmt
[
0
],
p_stream
->
i_stream_type
,
p_es
=
dvbpsi_PMTAddES
(
&
p_sys
->
dvbpmt
[
0
],
p_stream
->
i_pid
);
p_stream
->
i_stream_type
,
p_stream
->
i_pid
);
if
(
p_stream
->
i_stream_id
==
0xfa
||
p_stream
->
i_stream_id
==
0xfb
)
if
(
p_stream
->
i_stream_id
==
0xfa
||
p_stream
->
i_stream_id
==
0xfb
)
{
{
...
@@ -2392,7 +2392,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
...
@@ -2392,7 +2392,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
}
}
}
}
for
(
int
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
for
(
unsigned
i
=
0
;
i
<
p_sys
->
i_num_pmt
;
i
++
)
{
{
dvbpsi_psi_section_t
*
sect
=
dvbpsi_GenPMTSections
(
&
p_sys
->
dvbpmt
[
i
]
);
dvbpsi_psi_section_t
*
sect
=
dvbpsi_GenPMTSections
(
&
p_sys
->
dvbpmt
[
i
]
);
block_t
*
pmt
=
WritePSISection
(
p_mux
->
p_sout
,
sect
);
block_t
*
pmt
=
WritePSISection
(
p_mux
->
p_sout
,
sect
);
...
...
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