summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* fix libgui header locationMathias Agopian2012-02-273-4/+3
| | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* libagl shouldn't export anythingMathias Agopian2012-02-271-640/+0
| | | | Change-Id: Ia823dbc56aab2a0b8a6063df4348fe6baac124c6
* remove dependency on android_native{s_priv|buffer}.hMathias Agopian2012-02-242-18/+1
| | | | Change-Id: Ie4b95f7061c240f37c504414259f92d72c4ffc89
* Add new APIs AMessage::(set|find)Buffer to make it safer to passAndreas Huber2012-02-221-0/+7
| | | | | | ABuffer objects through messages. Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
* Implementation of a java media codec interface and associated tools.Andreas Huber2012-02-226-30/+316
| | | | Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
* Merge "Limit the amount of audio record data in each buffer"James Dong2012-02-211-0/+1
|\
| * Limit the amount of audio record data in each bufferJames Dong2012-02-151-0/+1
| | | | | | | | | | | | | | o The size of each input buffer should be less than or equal to kMaxBufferSize o related-to-bug: 5977032 Change-Id: I04343169aac3df56694aad4ba7967ec45337ad7e
* | Upintegreate AAH TX and RX players from ICS_AAHJohn Grossman2012-02-161-0/+3
| | | | | | | | | | | | | | | | Upintegrate the android at home TX and RX players developed in the ICS_AAH branch. Change-Id: I8247d3702e30d8b0e215b31a92675d8ab28dccbb Signed-off-by: John Grossman <johngro@google.com>
* | Upintegrate Audio Flinger changes from ICS_AAHJohn Grossman2012-02-163-2/+43
| | | | | | | | | | | | | | | | Bring in changes to audio flinger made to support timed audio tracks and HW master volume control. Change-Id: Ide52d48809bdbed13acf35fd59b24637e35064ae Signed-off-by: John Grossman <johngro@google.com>
* | Upintegrate the common_time service from ics-aah.Mike J. Chen2012-02-164-0/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the common_time service developed in the ics-aah branch back into master. The common_time service is a small service build to synchronize an arbitrary timeline amongst peers on a local sub-net. While running and configured, the service will elect a master from the set of available devices within the subnet, define a relationship between the common_time timeline the local time timeline (provided by the local time HAL), and then attempt to maintain synchronization between common and local time by controlling the frequency of the local time clock via the HAL, or by disciplining local time in the digital domain if the local time HAL implementation does not support HW slewing. On its own, the native common time service will do nothing until it is configured. The CommonTimeManagementService (running out of the system server process) is responsible for implementing policy regarding configuration and operation of the common_time service and will be added in a subsequent CL. Change-Id: I71292f9b9b1797665865689c4572c9d3a0552f64 Signed-off-by: John Grossman <johngro@google.com>
* | Merge "Update comments"Glenn Kasten2012-02-146-30/+65
|\ \
| * | Update commentsGlenn Kasten2012-02-146-30/+65
| | | | | | | | | | | | | | | | | | We no longer put the filename at start of file. Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
* | | Merge "Remove dead code AudioTrack::getLoop"Glenn Kasten2012-02-141-1/+0
|\ \ \ | |/ / |/| |
| * | Remove dead code AudioTrack::getLoopGlenn Kasten2012-02-081-1/+0
| | | | | | | | | | | | Change-Id: I868329c52f31bc20125f068500d8f892b4ec9796
* | | AudioRecord and AudioTrack client tidGlenn Kasten2012-02-143-3/+7
| |/ |/| | | | | | | | | Inform AudioFlinger of the tid of the callback thread. Change-Id: I670df92dd06749b057238b48ed1094b13aab720b
* | Playback rate on MediaPlayerJean-Michel Trivi2012-02-133-0/+7
| | | | | | | | | | | | | | | | | | Add support for modifying the playback rate of a MediaPlayer by altering the sample rate of its AudioTrack. The playback rate is expressed in permille, where 1000 is the playback at normal speed. Change-Id: I981d060ab32f7bae7a767e82c60c88ae635dceed
* | Move away from MediaDebug and use ADebug insteadJames Dong2012-02-101-36/+0
| | | | | | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* | Merge "Enable B frame support in MPEG4Writer"James Dong2012-02-081-1/+1
|\ \ | |/ |/|
| * Enable B frame support in MPEG4WriterJames Dong2012-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows us to automatically detect whether ctts box is needed in MPEG4Writer. MPEG4Writer uses ctts version 0 (non-negative offset value) store the composition time offset on a needed basis. Currently, the size of the ctts box is not optimized. Optimization will be addressed in a subsequent patch. o also changed the private method retrieveDecodingTime(bool) in OMXCodec to getDecodingTime() o related-to-bug: 4232183 Change-Id: Ic6dc7b25ecd258c2506ca4b9c25156e922456e51
* | Use audio_io_handle_t consistently instead of intGlenn Kasten2012-02-083-27/+37
| | | | | | | | | | | | | | | | Other: - add a comment to nextUniqueId - made ThreadBase::mId const, since it is only assigned in constructor. Change-Id: I4e8b7bec4e45badcde6274d574b8a9aabd046837
* | Effect UUID inputs passed by pointer are constGlenn Kasten2012-02-083-5/+5
| | | | | | | | Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8
* | Merge "Don't double destruct audio_track_cblk_t"Glenn Kasten2012-02-081-0/+1
|\ \
| * | Don't double destruct audio_track_cblk_tGlenn Kasten2012-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fortunately audio_track_cblk_t doesn't have a destructor, but for clarity remove the double destruction. Also add warning not to add any virtuals to audio_track_cblk_t. Change-Id: I70ebe1a70460c7002145b2cdf10f9f137396e6f3
* | | Merge "Remove dead mutex in AudioTrack/AudioRecord thread"Glenn Kasten2012-02-082-2/+0
|\ \ \
| * | | Remove dead mutex in AudioTrack/AudioRecord threadGlenn Kasten2012-02-022-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client callback threads had mutexes called AudioTrackThread::mLock and ClientRecordThread::mLock. These mutexes were only used by start() and stop(), and were unused by the thread itself. But start() and stop() already have their own protection provided by AudioTrack::mLock and AudioRecord::mLock. So the thread mutexes can be removed. Change-Id: I098406d381645d77fba06a15511e179a327848ef
* | | | Merge "AudioTrack declare more methods const"Glenn Kasten2012-02-081-7/+7
|\ \ \ \
| * | | | AudioTrack declare more methods constGlenn Kasten2012-02-031-7/+7
| | |/ / | |/| | | | | | | | | | Change-Id: I4999e984460893961d0d8092cff17f3cf07d7214
* | | | Merge "Declare more IAudioFlinger methods const"Glenn Kasten2012-02-082-8/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Declare more IAudioFlinger methods constGlenn Kasten2012-02-032-8/+10
| |/ / | | | | | | | | | | | | | | | | | | This is just documentation, as C++ method const-ness doesn't mean anything for a binder API. Instead, here const means "no side effects". Change-Id: Iaa9cd2fe477db10ae9a40cac4f79f0faa9b4e5e6
* | | Don't call virtual function in destructor of SurfaceMediaSourceJames Dong2012-02-061-1/+3
| | | | | | | | | | | | Change-Id: I3cbc2b1222335b61c814b5cdcfaefa495148b0ec
* | | Merge "Don't call virtual functions in the destructor for audio and camera ↵James Dong2012-02-043-6/+5
|\ \ \ | | | | | | | | | | | | source classes"
| * | | Don't call virtual functions in the destructor for audio and camera source ↵James Dong2012-02-023-6/+5
| | |/ | |/| | | | | | | | | | | | | classes Change-Id: Ia74ffc1c0cbd7971697f5e3c476e340ec5c7727a
* | | Merge "Don't call virtual functions in destructors for the writer classes"James Dong2012-02-034-4/+8
|\ \ \ | |_|/ |/| |
| * | Don't call virtual functions in destructors for the writer classesJames Dong2012-02-024-4/+8
| |/ | | | | | | | | | | | | Have not found any concrete bugs related to these calls yet, but we should avoid calling virtual functions in destructors, regardless. Change-Id: I2d47b79d3fb2d29f418619bee83aa147d232a5d4
* | Merge "Use audio_in_acoustics_t consistently"Glenn Kasten2012-02-031-1/+1
|\ \
| * | Use audio_in_acoustics_t consistentlyGlenn Kasten2012-01-271-1/+1
| | | | | | | | | | | | Change-Id: I0a9dd668fb2e57b1c3ece3190588194974b99062
* | | Merge "Use ToneGenerator::tone_type consistently"Glenn Kasten2012-02-031-2/+2
|\ \ \
| * | | Use ToneGenerator::tone_type consistentlyGlenn Kasten2012-01-271-2/+2
| |/ / | | | | | | | | | | | | | | | | | | Also remove defaults in startToneCommand(), they're not needed and the default for tone type was nonsense. Change-Id: I70fa8cee4f3dbb8c66ceb3719c8d3d2f447f05b9
* | | Use NULL not 0 for raw pointersGlenn Kasten2012-02-034-18/+18
| | | | | | | | | | | | | | | | | | Use if (p != NULL) instead of if (ptr) Change-Id: Iaec3413a59ccbf233c98fcd918cc7d70ac5da9fa
* | | Merge "Make AudioTrack control block volume field private"Glenn Kasten2012-02-031-1/+14
|\ \ \
| * | | Make AudioTrack control block volume field privateGlenn Kasten2012-01-201-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of the process of abstracting the control block to make it easier to maintain. Change-Id: Idb8f461e68dab3bcf268159cc0781651c6fb7094
* | | | Merge "More audio_stream_type_t"Glenn Kasten2012-02-021-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | More audio_stream_type_tGlenn Kasten2012-01-271-1/+1
| | | | | | | | | | | | | | | | Change-Id: I1260259efe0aa3fc1ef13de69758aaa592e1f815
* | | | Slighly improve the API to discover if the OMX stack is running in the localAndreas Huber2012-01-311-2/+2
|/ / / | | | | | | | | | | | | | | | process. Change-Id: Idd3c2f0d4a9542af01a3fdfd3b0bfab90e083505
* | | Merge "Use audio_source_t consistently"Glenn Kasten2012-01-274-8/+7
|\ \ \ | |_|/ |/| |
| * | Use audio_source_t consistentlyGlenn Kasten2012-01-264-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was a mix of audio_source_t, uint8_t, and int. Related fixes: - fix comments in MediaRecorder.java - AudioPolicyService server side was not checking source parameter at all, so if the client wrapper was bypassed, invalid values could be passed into audio HAL - JNI android_media_AudioRecord_setup was checking source for positive values, but not negative values. This test is redundant, since already checked at Java and now checked by AudioPolicyService also, but might as well make it correct. Change-Id: Ie5e25d646dcd59a86d7985aa46cfcb4a1ba64a4a
* | | The software AAC encoder is now an OMX component.Andreas Huber2012-01-261-0/+1
|/ / | | | | | | | | | | Yay. Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
* | Remove AudioFlinger dependencies on clientGlenn Kasten2012-01-201-1/+1
|/ | | | Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
* Use audio_format_t consistently, continuedGlenn Kasten2012-01-204-20/+20
| | | | | | | | | | | | Was int or uint32_t. When AudioFlinger::format can't determine the correct format, return INVALID rather than DEFAULT. Init mFormat to INVALID rather than DEFAULT in the constructor. Subclass constructors will set mFormat to the correct value. Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
* Merge "Remove dead file include/media/thread_init.h"Glenn Kasten2012-01-201-24/+0
|\