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
fc297771
Commit
fc297771
authored
Jul 26, 2013
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: inline aout_DecDeleteBuffer()
parent
32e1127d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
12 deletions
+2
-12
src/audio_output/aout_internal.h
src/audio_output/aout_internal.h
+0
-1
src/audio_output/dec.c
src/audio_output/dec.c
+0
-9
src/input/decoder.c
src/input/decoder.c
+2
-2
No files found.
src/audio_output/aout_internal.h
View file @
fc297771
...
...
@@ -136,7 +136,6 @@ bool aout_ChangeFilterString( vlc_object_t *manager, vlc_object_t *aout,
int
aout_DecNew
(
audio_output_t
*
,
const
audio_sample_format_t
*
,
const
audio_replay_gain_t
*
,
const
aout_request_vout_t
*
);
void
aout_DecDelete
(
audio_output_t
*
);
void
aout_DecDeleteBuffer
(
audio_output_t
*
,
block_t
*
);
int
aout_DecPlay
(
audio_output_t
*
,
block_t
*
,
int
i_input_rate
);
int
aout_DecGetResetLost
(
audio_output_t
*
);
void
aout_DecChangePause
(
audio_output_t
*
,
bool
b_paused
,
mtime_t
i_date
);
...
...
src/audio_output/dec.c
View file @
fc297771
...
...
@@ -182,15 +182,6 @@ void aout_RequestRestart (audio_output_t *aout, unsigned mode)
* Buffer management
*/
/*****************************************************************************
* aout_DecDeleteBuffer : destroy an undecoded buffer
*****************************************************************************/
void
aout_DecDeleteBuffer
(
audio_output_t
*
aout
,
block_t
*
block
)
{
(
void
)
aout
;
block_Release
(
block
);
}
static
void
aout_StopResampling
(
audio_output_t
*
aout
)
{
aout_owner_t
*
owner
=
aout_owner
(
aout
);
...
...
src/input/decoder.c
View file @
fc297771
...
...
@@ -1266,7 +1266,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
if
(
DecoderIsExitRequested
(
p_dec
)
)
{
/* It prevent freezing VLC in case of broken decoder */
aout_DecDeleteBuffer
(
p_aout
,
p_aout_buf
);
block_Release
(
p_aout_buf
);
if
(
p_block
)
block_Release
(
p_block
);
break
;
...
...
@@ -1276,7 +1276,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
if
(
p_owner
->
i_preroll_end
>
VLC_TS_INVALID
&&
p_aout_buf
->
i_pts
<
p_owner
->
i_preroll_end
)
{
aout_DecDeleteBuffer
(
p_aout
,
p_aout_buf
);
block_Release
(
p_aout_buf
);
continue
;
}
...
...
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