| 3e98ecd18c906dc3ac2ff1a890f0b3163447272d |
|
18-May-2015 |
Glenn Kasten <gkasten@google.com> |
Clear mAudioRecord and mAudioTrack on set() failure
Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| b187de1ada34a9023c05d020a4592686ba761278 |
|
30-Dec-2014 |
Glenn Kasten <gkasten@google.com> |
Line length 100
Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 08b9e2d113213c37506a416bc95a36789bcab4ca |
|
16-Dec-2014 |
Marco Nelissen <marcone@google.com> |
Use callbacks for Midi I/O
Instead of having the Sonivox engine directly open the file and
use stdio to read from it, use caller-provided callbacks.
Change-Id: I4d775c8458c48c591a15794c4517e006dcf034e1
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| bce50bfc3846ab008bafa75c5d3f29fd7b5395f7 |
|
28-Feb-2014 |
Glenn Kasten <gkasten@google.com> |
Fix type of AudioTrack/AudioRecord parameter frameCount
It's size_t consistently
Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 1ab85ec401801ef9a9184650d0f5a1639b45eeb9 |
|
31-May-2013 |
Glenn Kasten <gkasten@google.com> |
Include what is needed
Remove old includes.
Header files only include other header files that they directly need themselves.
Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 2799d743ee2ae5a25fe869a7f9c052acc029559f |
|
30-May-2013 |
Glenn Kasten <gkasten@google.com> |
Use sp<AudioTrack> instead of raw AudioTrack *
This change prepares for the new implementation of AudioTrack client, which
will require clients to use only sp<AudioTrack>, not raw AudioTrack *.
A raw delete will cause a race condition during AudioTrack destruction.
AudioTrack was made a RefBase by commit b68a91a70bc8d0d18e7404e14443d4e4020b3635
on 2011/11/15, when it was needed by OpenSL ES (for the callback protector).
At that time, the only other client that was also converted from
AudioTrack * to sp<AudioTrack> was android.media.AudioTrack JNI in
project frameworks/base (file android_media_AudioTrack.cpp).
Details:
* Use .clear() instead of delete followed by = NULL.
* ALOG %p need .get().
* sp<> don't need to be listed in constructor initializer, if initially 0.
* Use == 0 for sp<> vs == NULL for raw pointers.
* Use if (sp != 0) instead of if (raw).
Change-Id: Ic7cad25795d6e862e112abdc227b6d33afdfce17
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 0ca3cf94c0dfc173ad7886ae162c4b67067539f6 |
|
18-Apr-2012 |
Eric Laurent <elaurent@google.com> |
rename audio policy output flags
Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 2e66a7896c9a9da3a15fc6cff9be28b4174d8719 |
|
26-Mar-2012 |
Eric Laurent <elaurent@google.com> |
reorganize SoundPool and JetPlayer code.
Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.
Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.
Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 17a736c3e1d062d7fc916329eb32aef8935614af |
|
14-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Update comments
Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| ab334fd351ae5a0e18903da123d63e565b536874 |
|
14-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
audio_channel_in/out_mask_from_count
and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count
Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| e53b9ead781c36e96d6b6f012ddffc93a3d80f0d |
|
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.
Use git diff -b or -w to verify.
Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 18868c5db2f90309c6d11e5837822135e4a0c0fa |
|
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_policy_output_flags_t consistently
This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these
Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 9d1f02d74fd395ec4de6861147da289423f0ab6f |
|
09-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Follow raw pointer and sp<> conventions
Unconditional delete for raw pointers.
Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)".
Use "if (raw != NULL)" not "if (raw)".
Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 4cc55d53d542c4f4ed645738cebb65b9e7eb6c44 |
|
12-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_format_t consistently"
|
| 83bc7f3cf78b28a818417f40a4f0c00593993366 |
|
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
libmedia new can't fail on Android
Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 0049acfc8b1c33eb90afc925dacd08a487618e17 |
|
10-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Fix bug in JetPlayer::loadFromFile
A long pathname would corrupt the heap due to incorrect use of strncpy.
Also was using hard-coded constant 256 instead of PATH_MAX.
Change-Id: Iba382bbb38624fbc41fec91449f9814f77d4ac0d
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| e1c3962e268ffc12bfd1bd9ea84da1f135f36960 |
|
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_format_t consistently
Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield.
Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by
AUDIO_FORMAT_PCM_16_BIT.
Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| a23856c0ad1f49a6ebcb71d3f63f329edc999a72 |
|
24-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
JetPlayer uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 3856b090cd04ba5dd4a59a12430ed724d5995909 |
|
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 0512ab559d4670c2204078470d7ef5d376811c57 |
|
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
Remove dead code related to gettid
The gettid system call is always available now.
Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| fce7a473248381cc83a01855f92581077d3c9ee2 |
|
20-Apr-2011 |
Dima Zavin <dima@android.com> |
audio/media: convert to using the audio HAL and new audio defs
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| c2f1f07084818942352c6bbfb36af9b6b330eb4e |
|
17-Jul-2009 |
Eric Laurent <elaurent@google.com> |
Fix issue 1795088 Improve audio routing code
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 06aff807c612d1f3b38168d3abcc67bb19ec8d3d |
|
25-Mar-2009 |
Jean-Michel Trivi <> |
Automated import from //branches/master/...@140869,140869
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 1179bc9b0e3d17c984e8f4ad38561c049dd102fa |
|
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 89fa4ad53f2f4d57adbc97ae1149fc00c9b6f3c5 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 15f767b960b38059a74a42a33e16d8df2aec8bc1 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 25658fd43d150a45fb37734a9f9f27f48bb5c133 |
|
19-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@132276
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 7a2146d5807030b2629f347736be5301b61e8811 |
|
13-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@131421
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| 5e07b5774c8b376776caa4f5b0a193767697e97e |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/av/media/libmedia/JetPlayer.cpp
|
| cce8bd12da6d8419a8770e4552a51ec297c250c2 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/av/media/libmedia/JetPlayer.cpp
|