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
d470a924
Commit
d470a924
authored
Dec 02, 2013
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
audio unit: fix init order
parent
c5b2b0a2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/audio_output/audiounit_ios.c
modules/audio_output/audiounit_ios.c
+6
-6
No files found.
modules/audio_output/audiounit_ios.c
View file @
d470a924
...
@@ -251,15 +251,15 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
...
@@ -251,15 +251,15 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
return
false
;
return
false
;
}
}
/* AU init
iliaze
*/
/* AU init */
status
=
AudioUnitInitialize
(
p_sys
->
au_unit
);
status
=
AudioUnitInitialize
(
p_sys
->
au_unit
);
if
(
status
!=
noErr
)
{
if
(
status
!=
noErr
)
{
msg_Err
(
p_aout
,
"failed to init AudioUnit (%li)"
,
status
);
msg_Err
(
p_aout
,
"failed to init AudioUnit (%li)"
,
status
);
return
false
;
return
false
;
}
}
status
=
AudioOutputUnitStart
(
p_sys
->
au_unit
);
/* setup circular buffer */
msg_Dbg
(
p_aout
,
"audio output unit started: %li"
,
status
);
TPCircularBufferInit
(
&
p_sys
->
circular_buffer
,
AUDIO_BUFFER_SIZE_IN_SECONDS
*
fmt
->
i_rate
*
fmt
->
i_bytes_per_frame
);
/* start audio session so playback continues if mute switch is on */
/* start audio session so playback continues if mute switch is on */
AudioSessionInitialize
(
NULL
,
AudioSessionInitialize
(
NULL
,
...
@@ -272,8 +272,8 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
...
@@ -272,8 +272,8 @@ static int StartAnalog(audio_output_t *p_aout, audio_sample_format_t *fmt)
AudioSessionSetProperty
(
kAudioSessionProperty_AudioCategory
,
sizeof
(
sessionCategory
),
&
sessionCategory
);
AudioSessionSetProperty
(
kAudioSessionProperty_AudioCategory
,
sizeof
(
sessionCategory
),
&
sessionCategory
);
AudioSessionSetActive
(
true
);
AudioSessionSetActive
(
true
);
/* setup circular buffer */
status
=
AudioOutputUnitStart
(
p_sys
->
au_unit
);
TPCircularBufferInit
(
&
p_sys
->
circular_buffer
,
AUDIO_BUFFER_SIZE_IN_SECONDS
*
fmt
->
i_rate
*
fmt
->
i_bytes_per_frame
);
msg_Dbg
(
p_aout
,
"audio output unit started: %li"
,
status
);
return
true
;
return
true
;
}
}
...
@@ -396,7 +396,7 @@ static OSStatus RenderCallback(vlc_object_t *p_obj,
...
@@ -396,7 +396,7 @@ static OSStatus RenderCallback(vlc_object_t *p_obj,
Float32
*
buffer
=
TPCircularBufferTail
(
&
p_sys
->
circular_buffer
,
&
availableBytes
);
Float32
*
buffer
=
TPCircularBufferTail
(
&
p_sys
->
circular_buffer
,
&
availableBytes
);
/* check if we have enough data */
/* check if we have enough data */
if
(
!
availableBytes
||
p_sys
->
b_paused
||!
buffer
)
{
if
(
!
availableBytes
||
p_sys
->
b_paused
)
{
/* return an empty buffer so silence is played until we have data */
/* return an empty buffer so silence is played until we have data */
memset
(
targetBuffer
,
0
,
ioData
->
mBuffers
[
0
].
mDataByteSize
);
memset
(
targetBuffer
,
0
,
ioData
->
mBuffers
[
0
].
mDataByteSize
);
}
else
{
}
else
{
...
...
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