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
c2ae62db
Commit
c2ae62db
authored
Dec 05, 2012
by
Denis Charmet
Committed by
Jean-Baptiste Kempf
Dec 06, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow the demux to update its title list
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
7697d8b2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
0 deletions
+31
-0
include/vlc_input.h
include/vlc_input.h
+1
-0
src/input/input.c
src/input/input.c
+30
-0
No files found.
include/vlc_input.h
View file @
c2ae62db
...
@@ -245,6 +245,7 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
...
@@ -245,6 +245,7 @@ static inline void vlc_input_attachment_Delete( input_attachment_t *a )
#define INPUT_UPDATE_SEEKPOINT 0x0020
#define INPUT_UPDATE_SEEKPOINT 0x0020
#define INPUT_UPDATE_META 0x0040
#define INPUT_UPDATE_META 0x0040
#define INPUT_UPDATE_SIGNAL 0x0080
#define INPUT_UPDATE_SIGNAL 0x0080
#define INPUT_UPDATE_TITLE_LIST 0x0100
/**
/**
* This defines private core storage for an input.
* This defines private core storage for an input.
...
...
src/input/input.c
View file @
c2ae62db
...
@@ -82,6 +82,7 @@ static void UpdateGenericFromAccess( input_thread_t * );
...
@@ -82,6 +82,7 @@ static void UpdateGenericFromAccess( input_thread_t * );
static
int
UpdateTitleSeekpointFromDemux
(
input_thread_t
*
);
static
int
UpdateTitleSeekpointFromDemux
(
input_thread_t
*
);
static
void
UpdateGenericFromDemux
(
input_thread_t
*
);
static
void
UpdateGenericFromDemux
(
input_thread_t
*
);
static
void
UpdateTitleListfromDemux
(
input_thread_t
*
);
static
void
MRLSections
(
const
char
*
,
int
*
,
int
*
,
int
*
,
int
*
);
static
void
MRLSections
(
const
char
*
,
int
*
,
int
*
,
int
*
,
int
*
);
...
@@ -584,6 +585,11 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, bool *pb_d
...
@@ -584,6 +585,11 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, bool *pb_d
{
{
if
(
p_input
->
p
->
input
.
p_demux
->
info
.
i_update
)
if
(
p_input
->
p
->
input
.
p_demux
->
info
.
i_update
)
{
{
if
(
p_input
->
p
->
input
.
p_demux
->
info
.
i_update
&
INPUT_UPDATE_TITLE_LIST
)
{
UpdateTitleListfromDemux
(
p_input
);
p_input
->
p
->
input
.
p_demux
->
info
.
i_update
&=
~
INPUT_UPDATE_TITLE_LIST
;
}
if
(
p_input
->
p
->
input
.
b_title_demux
)
if
(
p_input
->
p
->
input
.
b_title_demux
)
{
{
i_ret
=
UpdateTitleSeekpointFromDemux
(
p_input
);
i_ret
=
UpdateTitleSeekpointFromDemux
(
p_input
);
...
@@ -2267,6 +2273,30 @@ static void UpdateGenericFromDemux( input_thread_t *p_input )
...
@@ -2267,6 +2273,30 @@ static void UpdateGenericFromDemux( input_thread_t *p_input )
p_demux
->
info
.
i_update
&=
~
INPUT_UPDATE_SIZE
;
p_demux
->
info
.
i_update
&=
~
INPUT_UPDATE_SIZE
;
}
}
static
void
UpdateTitleListfromDemux
(
input_thread_t
*
p_input
)
{
input_source_t
*
in
=
&
p_input
->
p
->
input
;
/* Delete the preexisting titles */
if
(
in
->
i_title
>
0
)
{
for
(
int
i
=
0
;
i
<
in
->
i_title
;
i
++
)
vlc_input_title_Delete
(
in
->
title
[
i
]
);
TAB_CLEAN
(
in
->
i_title
,
in
->
title
);
in
->
b_title_demux
=
false
;
}
/* Get the new title list */
if
(
demux_Control
(
in
->
p_demux
,
DEMUX_GET_TITLE_INFO
,
&
in
->
title
,
&
in
->
i_title
,
&
in
->
i_title_offset
,
&
in
->
i_seekpoint_offset
)
)
TAB_INIT
(
in
->
i_title
,
in
->
title
);
else
in
->
b_title_demux
=
true
;
InitTitle
(
p_input
);
}
/*****************************************************************************
/*****************************************************************************
* Update*FromAccess:
* Update*FromAccess:
...
...
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