Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
d9d50550
Commit
d9d50550
authored
Oct 15, 2012
by
Ghislain MARY
Browse files
Fix unresolved symbols for Android 2.2 and Android 4.1.
parent
34bad3dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
8 deletions
+26
-8
src/android/AudioRecord.cpp
src/android/AudioRecord.cpp
+15
-5
src/android/AudioTrack.cpp
src/android/AudioTrack.cpp
+11
-3
No files found.
src/android/AudioRecord.cpp
View file @
d9d50550
...
...
@@ -80,8 +80,6 @@ bool AudioRecordImpl::init(Library *lib){
if
(
!
impl
->
mInitCheck
.
isFound
())
goto
fail
;
if
(
!
impl
->
mStop
.
isFound
())
goto
fail
;
if
(
!
impl
->
mStart
.
isFound
())
goto
fail
;
if
(
!
impl
->
mGetMinFrameCount
.
isFound
())
goto
fail
;
//if (!impl->mGetInput.isFound()) goto fail;
sImpl
=
impl
;
return
true
;
...
...
@@ -93,17 +91,29 @@ fail:
AudioRecordImpl
*
AudioRecordImpl
::
sImpl
=
NULL
;
AudioRecordImpl
::
AudioRecordImpl
(
Library
*
lib
)
:
// By default, try to load Android 2.3 symbols
mCtor
(
lib
,
"_ZN7android11AudioRecordC1EijijijPFviPvS1_ES1_ii"
),
mDtor
(
lib
,
"_ZN7android11AudioRecordD1Ev"
),
mInitCheck
(
lib
,
"_ZNK7android11AudioRecord9initCheckEv"
),
mStop
(
lib
,
"_ZN7android11AudioRecord4stopEv"
),
mStart
(
lib
,
"_ZN7android11AudioRecord5startEv"
),
mGetMinFrameCount
(
lib
,
"_ZN7android11AudioRecord16getMinFrameCountEPijii"
)
//mGetInput(lib,"_ZN7android11AudioRecord8getInputEv")
{
//Android 2.2 symbol
:
if
(
!
mCtor
.
isFound
())
//
Try some
Android 2.2 symbol
s if not found
if
(
!
mCtor
.
isFound
())
{
mCtor
.
load
(
lib
,
"_ZN7android11AudioRecordC1EijijijPFviPvS1_ES1_i"
);
}
// Then try some Android 4.1 symbols if still not found
if
(
!
mCtor
.
isFound
())
{
mCtor
.
load
(
lib
,
"_ZN7android11AudioRecordC1E14audio_source_tj14audio_format_tjiNS0_12record_flagsEPFviPvS4_ES4_ii"
);
}
if
(
!
mStart
.
isFound
())
{
mStart
.
load
(
lib
,
"_ZN7android11AudioRecord5startENS_11AudioSystem12sync_event_tEi"
);
}
if
(
!
mGetMinFrameCount
.
isFound
())
{
mGetMinFrameCount
.
load
(
lib
,
"_ZN7android11AudioRecord16getMinFrameCountEPij14audio_format_ti"
);
}
}
...
...
src/android/AudioTrack.cpp
View file @
d9d50550
...
...
@@ -75,6 +75,7 @@ namespace fake_android{
}
AudioTrackImpl
::
AudioTrackImpl
(
Library
*
lib
)
:
// By default, try to load Android 2.3 symbols
mCtor
(
lib
,
"_ZN7android10AudioTrackC1EijiiijPFviPvS1_ES1_ii"
),
mDtor
(
lib
,
"_ZN7android10AudioTrackD1Ev"
),
mInitCheck
(
lib
,
"_ZNK7android10AudioTrack9initCheckEv"
),
...
...
@@ -85,8 +86,16 @@ namespace fake_android{
mGetMinFrameCount
(
lib
,
"_ZN7android10AudioTrack16getMinFrameCountEPiij"
),
mLatency
(
lib
,
"_ZNK7android10AudioTrack7latencyEv"
),
mGetPosition
(
lib
,
"_ZN7android10AudioTrack11getPositionEPj"
)
{
{
// Try some Android 2.2 symbols if not found
if
(
!
mCtor
.
isFound
())
{
mCtor
.
load
(
lib
,
"_ZN7android10AudioTrackC1EijiiijPFviPvS1_ES1_i"
);
}
// Then try some Android 4.1 symbols if still not found
if
(
!
mGetMinFrameCount
.
isFound
())
{
mGetMinFrameCount
.
load
(
lib
,
"_ZN7android10AudioTrack16getMinFrameCountEPi19audio_stream_type_tj"
);
}
}
bool
AudioTrackImpl
::
init
(
Library
*
lib
){
...
...
@@ -97,7 +106,6 @@ namespace fake_android{
if
(
!
impl
->
mStop
.
isFound
())
goto
fail
;
if
(
!
impl
->
mInitCheck
.
isFound
())
goto
fail
;
if
(
!
impl
->
mFlush
.
isFound
())
goto
fail
;
if
(
!
impl
->
mGetMinFrameCount
.
isFound
())
goto
fail
;
if
(
!
impl
->
mLatency
.
isFound
())
goto
fail
;
if
(
!
impl
->
mGetPosition
.
isFound
())
goto
fail
;
sImpl
=
impl
;
...
...
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