summaryrefslogtreecommitdiffstats
path: root/media/libmedia/JetPlayer.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Clear mAudioRecord and mAudioTrack on set() failureGlenn Kasten2015-05-181-1/+7
| | | | | | Bug: 20818955 Bug: 20890069 Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
* Line length 100Glenn Kasten2014-12-301-2/+4
| | | | Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
* Use callbacks for Midi I/OMarco Nelissen2014-12-161-21/+5
| | | | | | | Instead of having the Sonivox engine directly open the file and use stdio to read from it, use caller-provided callbacks. Change-Id: I4d775c8458c48c591a15794c4517e006dcf034e1
* Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-281-1/+1
| | | | | | It's size_t consistently Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
* Include what is neededGlenn Kasten2013-07-021-2/+0
| | | | | | | Remove old includes. Header files only include other header files that they directly need themselves. Change-Id: Ic471386808d9f42ea19ccbd59cb50a5f83a89dd0
* Use sp<AudioTrack> instead of raw AudioTrack *Glenn Kasten2013-06-031-4/+2
| | | | | | | | | | | | | | | | | | | | | 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
* rename audio policy output flagsEric Laurent2012-04-181-1/+1
| | | | Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
* reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-261-1/+1
| | | | | | | | | | 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
* Update commentsGlenn Kasten2012-03-191-1/+1
| | | | Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
* audio_channel_in/out_mask_from_countGlenn Kasten2012-03-151-1/+1
| | | | | | | and avoid ambiguous term "channels" where it might be confusing as to whether it is a channel mask or channel count Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
* Whitespace and indentationGlenn Kasten2012-03-131-26/+25
| | | | | | | | | | | | | | 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
* Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-091-1/+1
| | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* Follow raw pointer and sp<> conventionsGlenn Kasten2012-02-101-5/+3
| | | | | | | | 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
* Merge "Use audio_format_t consistently"Glenn Kasten2012-01-121-1/+1
|\
| * Use audio_format_t consistentlyGlenn Kasten2012-01-051-1/+1
| | | | | | | | | | | | | | | | 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
* | libmedia new can't fail on AndroidGlenn Kasten2012-01-111-4/+0
| | | | | | | | Change-Id: Ie79dd5abb8078b35474bf0f1b3a6ff994a3a3360
* | Fix bug in JetPlayer::loadFromFileGlenn Kasten2012-01-101-2/+2
| | | | | | | | | | | | | | | | 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
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-10/+10
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* JetPlayer uses C++ Thread not createThreadEtcGlenn Kasten2011-11-161-7/+2
| | | | | | This permits leveraging future improvements to Thread. Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-21/+21
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Remove dead code related to gettidGlenn Kasten2011-06-031-8/+1
| | | | | | The gettid system call is always available now. Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
* audio/media: convert to using the audio HAL and new audio defsDima Zavin2011-04-271-2/+2
| | | | | Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5 Signed-off-by: Dima Zavin <dima@android.com>
* Fix issue 1795088 Improve audio routing codeEric Laurent2009-07-231-1/+1
| | | | | | | 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()
* Automated import from //branches/master/...@140869,140869Jean-Michel Trivi2009-03-241-1/+1
|
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-1/+11
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+489
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-489/+0
|
* auto import from //branches/cupcake/...@132276The Android Open Source Project2009-02-191-3/+8
|
* auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-131-1/+1
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-7/+63
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-091-0/+428
generated by cgit v1.1 at 2024-04-29 19:28:23 +0000