Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
ed6c90b3
Commit
ed6c90b3
authored
Aug 01, 2011
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aout: correct mixer object name
parent
4f7824b2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
src/audio_output/mixer.c
src/audio_output/mixer.c
+5
-4
No files found.
src/audio_output/mixer.c
View file @
ed6c90b3
...
@@ -46,7 +46,8 @@ int aout_MixerNew( audio_output_t * p_aout )
...
@@ -46,7 +46,8 @@ int aout_MixerNew( audio_output_t * p_aout )
assert
(
!
p_aout
->
p_mixer
);
assert
(
!
p_aout
->
p_mixer
);
vlc_assert_locked
(
&
p_aout
->
lock
);
vlc_assert_locked
(
&
p_aout
->
lock
);
aout_mixer_t
*
p_mixer
=
vlc_object_create
(
p_aout
,
sizeof
(
*
p_mixer
)
);
aout_mixer_t
*
p_mixer
=
vlc_custom_create
(
p_aout
,
sizeof
(
*
p_mixer
),
"audio mixer"
);
if
(
!
p_mixer
)
if
(
!
p_mixer
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
...
@@ -129,7 +130,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
...
@@ -129,7 +130,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
break
;
break
;
/* We authorize a +-1 because rounding errors get compensated
/* We authorize a +-1 because rounding errors get compensated
* regularly. */
* regularly. */
msg_Warn
(
p_mixer
,
"
the mixer
got a packet in the past (%"
PRId64
")"
,
msg_Warn
(
p_mixer
,
"got a packet in the past (%"
PRId64
")"
,
start_date
-
prev_date
);
start_date
-
prev_date
);
aout_BufferFree
(
aout_FifoPop
(
p_fifo
)
);
aout_BufferFree
(
aout_FifoPop
(
p_fifo
)
);
...
@@ -169,7 +170,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
...
@@ -169,7 +170,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
ssize_t
delta
=
(
start_date
-
p_buffer
->
i_pts
)
ssize_t
delta
=
(
start_date
-
p_buffer
->
i_pts
)
*
p_mixer
->
fmt
.
i_rate
/
CLOCK_FREQ
;
*
p_mixer
->
fmt
.
i_rate
/
CLOCK_FREQ
;
if
(
delta
!=
0
)
if
(
delta
!=
0
)
msg_Warn
(
p_mixer
,
"
mixer
start is not output end (%zd)"
,
delta
);
msg_Warn
(
p_mixer
,
"
input
start is not output end (%zd)"
,
delta
);
if
(
delta
<
0
)
if
(
delta
<
0
)
{
{
/* Is it really the best way to do it ? */
/* Is it really the best way to do it ? */
...
@@ -199,7 +200,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
...
@@ -199,7 +200,7 @@ static int MixBuffer( audio_output_t * p_aout, float volume )
aout_buffer_t
*
p_inbuf
=
p_fifo
->
p_first
;
aout_buffer_t
*
p_inbuf
=
p_fifo
->
p_first
;
if
(
unlikely
(
p_inbuf
==
NULL
)
)
if
(
unlikely
(
p_inbuf
==
NULL
)
)
{
{
msg_Err
(
p_mixer
,
"internal
amix
error"
);
msg_Err
(
p_mixer
,
"internal error"
);
vlc_memset
(
p_out
,
0
,
needed
);
vlc_memset
(
p_out
,
0
,
needed
);
break
;
break
;
}
}
...
...
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