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
dc759af0
Commit
dc759af0
authored
Jul 23, 2015
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stream_demux: remove peek callback
parent
c88a5394
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
40 deletions
+0
-40
src/input/stream_demux.c
src/input/stream_demux.c
+0
-40
No files found.
src/input/stream_demux.c
View file @
dc759af0
...
@@ -58,7 +58,6 @@ struct stream_sys_t
...
@@ -58,7 +58,6 @@ struct stream_sys_t
};
};
static
int
DStreamRead
(
stream_t
*
,
void
*
p_read
,
unsigned
int
i_read
);
static
int
DStreamRead
(
stream_t
*
,
void
*
p_read
,
unsigned
int
i_read
);
static
int
DStreamPeek
(
stream_t
*
,
const
uint8_t
**
pp_peek
,
unsigned
int
i_peek
);
static
int
DStreamControl
(
stream_t
*
,
int
i_query
,
va_list
);
static
int
DStreamControl
(
stream_t
*
,
int
i_query
,
va_list
);
static
void
DStreamDelete
(
stream_t
*
);
static
void
DStreamDelete
(
stream_t
*
);
static
void
*
DStreamThread
(
void
*
);
static
void
*
DStreamThread
(
void
*
);
...
@@ -77,7 +76,6 @@ stream_t *stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *ou
...
@@ -77,7 +76,6 @@ stream_t *stream_DemuxNew( demux_t *p_demux, const char *psz_demux, es_out_t *ou
s
->
p_input
=
p_demux
->
p_input
;
s
->
p_input
=
p_demux
->
p_input
;
s
->
psz_path
=
strdup
(
""
);
/* N/A */
s
->
psz_path
=
strdup
(
""
);
/* N/A */
s
->
pf_read
=
DStreamRead
;
s
->
pf_read
=
DStreamRead
;
s
->
pf_peek
=
DStreamPeek
;
s
->
pf_control
=
DStreamControl
;
s
->
pf_control
=
DStreamControl
;
s
->
pf_destroy
=
DStreamDelete
;
s
->
pf_destroy
=
DStreamDelete
;
...
@@ -217,44 +215,6 @@ static int DStreamRead( stream_t *s, void *p_read, unsigned int i_read )
...
@@ -217,44 +215,6 @@ static int DStreamRead( stream_t *s, void *p_read, unsigned int i_read )
return
i_out
;
return
i_out
;
}
}
static
int
DStreamPeek
(
stream_t
*
s
,
const
uint8_t
**
pp_peek
,
unsigned
int
i_peek
)
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
block_t
**
pp_block
=
&
p_sys
->
p_block
;
int
i_out
=
0
;
*
pp_peek
=
0
;
//msg_Dbg( s, "DStreamPeek: wanted %d bytes", i_peek );
while
(
atomic_load
(
&
p_sys
->
active
)
&&
!
s
->
b_error
&&
i_peek
)
{
int
i_copy
;
if
(
!*
pp_block
)
{
*
pp_block
=
block_FifoGet
(
p_sys
->
p_fifo
);
if
(
!*
pp_block
)
s
->
b_error
=
1
;
}
if
(
*
pp_block
&&
i_peek
)
{
i_copy
=
__MIN
(
i_peek
,
(
*
pp_block
)
->
i_buffer
);
i_peek
-=
i_copy
;
i_out
+=
i_copy
;
if
(
i_peek
)
pp_block
=
&
(
*
pp_block
)
->
p_next
;
}
}
if
(
p_sys
->
p_block
)
{
p_sys
->
p_block
=
block_ChainGather
(
p_sys
->
p_block
);
*
pp_peek
=
p_sys
->
p_block
->
p_buffer
;
}
return
i_out
;
}
static
int
DStreamControl
(
stream_t
*
s
,
int
i_query
,
va_list
args
)
static
int
DStreamControl
(
stream_t
*
s
,
int
i_query
,
va_list
args
)
{
{
stream_sys_t
*
p_sys
=
s
->
p_sys
;
stream_sys_t
*
p_sys
=
s
->
p_sys
;
...
...
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