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
297529bf
Commit
297529bf
authored
Oct 13, 2010
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mux/mpeg/ts.c: splice_point generation fixes
Only generate splice points for VIDEO_ES and AUDIO_ES.
parent
a3e0b6ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
modules/mux/mpeg/ts.c
modules/mux/mpeg/ts.c
+6
-4
No files found.
modules/mux/mpeg/ts.c
View file @
297529bf
...
@@ -979,7 +979,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -979,7 +979,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream
->
i_codec
=
p_input
->
p_fmt
->
i_codec
;
p_stream
->
i_codec
=
p_input
->
p_fmt
->
i_codec
;
p_stream
->
i_continuity_counter
=
0
;
p_stream
->
i_continuity_counter
=
0
;
p_stream
->
b_discontinuity
=
false
;
p_stream
->
b_discontinuity
=
false
;
p_stream
->
b_splicing_point
=
tru
e
;
p_stream
->
b_splicing_point
=
fals
e
;
p_stream
->
i_splice_countdown
=
0
;
p_stream
->
i_splice_countdown
=
0
;
p_stream
->
i_decoder_specific_info
=
0
;
p_stream
->
i_decoder_specific_info
=
0
;
p_stream
->
p_decoder_specific_info
=
NULL
;
p_stream
->
p_decoder_specific_info
=
NULL
;
...
@@ -1034,6 +1034,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -1034,6 +1034,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
free
(
p_stream
);
free
(
p_stream
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_stream
->
b_splicing_point
=
true
;
p_sys
->
i_video_bound
++
;
p_sys
->
i_video_bound
++
;
break
;
break
;
...
@@ -1074,6 +1075,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -1074,6 +1075,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
free
(
p_stream
);
free
(
p_stream
);
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
}
}
p_stream
->
b_splicing_point
=
true
;
p_sys
->
i_audio_bound
++
;
p_sys
->
i_audio_bound
++
;
break
;
break
;
...
@@ -1173,7 +1175,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -1173,7 +1175,7 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
p_stream
->
lang
[
i
*
3
+
0
]
=
pl
->
psz_iso639_2T
[
0
];
p_stream
->
lang
[
i
*
3
+
0
]
=
pl
->
psz_iso639_2T
[
0
];
p_stream
->
lang
[
i
*
3
+
1
]
=
pl
->
psz_iso639_2T
[
1
];
p_stream
->
lang
[
i
*
3
+
1
]
=
pl
->
psz_iso639_2T
[
1
];
p_stream
->
lang
[
i
*
3
+
2
]
=
pl
->
psz_iso639_2T
[
2
];
p_stream
->
lang
[
i
*
3
+
2
]
=
pl
->
psz_iso639_2T
[
2
];
msg_Dbg
(
p_mux
,
" - lang=%c%c%c"
,
msg_Dbg
(
p_mux
,
" - lang=%c%c%c"
,
p_stream
->
lang
[
i
*
3
+
0
],
p_stream
->
lang
[
i
*
3
+
1
],
p_stream
->
lang
[
i
*
3
+
0
],
p_stream
->
lang
[
i
*
3
+
1
],
p_stream
->
lang
[
i
*
3
+
2
]
);
p_stream
->
lang
[
i
*
3
+
2
]
);
...
@@ -2077,8 +2079,8 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
...
@@ -2077,8 +2079,8 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
/* in (+) or out (-) point */
/* in (+) or out (-) point */
p_ts
->
p_buffer
[
12
]
=
p_stream
->
i_splice_countdown
>
0
?
p_ts
->
p_buffer
[
12
]
=
p_stream
->
i_splice_countdown
>
0
?
(
0x80
|
(
p_stream
->
i_splice_countdown
&
0x7f
))
:
0
;
(
0x80
|
(
p_stream
->
i_splice_countdown
&
0x7f
))
:
0
;
p_stream
->
b_splicing_point
=
!
(
p_stream
->
i_splice_countdown
==
127
);
p_stream
->
i_splice_countdown
++
;
p_stream
->
i_splice_countdown
++
;
p_stream
->
b_splicing_point
=
(
p_stream
->
i_splice_countdown
>=
127
)
?
false
:
true
;
}
}
for
(
i
=
i_stuffing_start
;
i
<
i_stuffing_start
+
i_stuffing
;
i
++
)
for
(
i
=
i_stuffing_start
;
i
<
i_stuffing_start
+
i_stuffing
;
i
++
)
...
@@ -2101,7 +2103,7 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
...
@@ -2101,7 +2103,7 @@ static block_t *TSNew( sout_mux_t *p_mux, ts_stream_t *p_stream,
/* in (+) or out (-) point */
/* in (+) or out (-) point */
p_ts
->
p_buffer
[
6
]
=
p_stream
->
i_splice_countdown
>
0
?
p_ts
->
p_buffer
[
6
]
=
p_stream
->
i_splice_countdown
>
0
?
(
0x80
|
(
p_stream
->
i_splice_countdown
&
0x7f
))
:
0
;
(
0x80
|
(
p_stream
->
i_splice_countdown
&
0x7f
))
:
0
;
p_stream
->
b_splicing_point
=
!
(
p_stream
->
i_splice_countdown
==
127
)
;
p_stream
->
b_splicing_point
=
(
p_stream
->
i_splice_countdown
>=
127
)
?
false
:
true
;
p_stream
->
i_splice_countdown
++
;
p_stream
->
i_splice_countdown
++
;
}
}
...
...
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