summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert ↵Colin Cross2014-01-287-9/+9
|\ | | | | | | | | | | | | LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" * commit 'bb9e396d311ea38e958fb5b56efff7aea4eaed82': frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| * am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to ↵Colin Cross2014-01-287-9/+9
| |\ | | | | | | | | | | | | | | | | | | LOCAL_MODULE_RELATIVE_PATH" * commit '06da69d57d90e180e1165905e6c703227a06f041': frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
| | * frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-277-9/+9
| | | | | | | | | | | | | | | | | | | | | LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it with LOCAL_MODULE_RELATIVE_PATH. Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
* | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ↵Eric Laurent2014-01-271-5/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | we do take a wakelock" * commit '1ae4b6ce27dca66ef9158abdd4744cb9b8d57c02': Only increase the counter when we do take a wakelock
| * | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| |\ \ | | |/ | | | | | | | | | * commit '4ef1dc2d5b5f5df93b173b0b4c4719d4484e031d': Only increase the counter when we do take a wakelock
| | * Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| | |\
| | | * Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We keep track on how many wakelocks we have taken. We always just take one real wakelock but increase / decrease the counter every time we try to acquire / release a wakelock. The counter is always increased even if the power manager is not ready, leading to an incorrect counter that could cause a crash when we try to release it. Make sure we only increase the counter when a wakelock, real or counted, is taken. Change-Id: Iad940e052694932f1dad8a1a71fa63601d289d6a
* | | | am 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in ↵Eric Laurent2014-01-271-3/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MemoryLeakTrackUtil" * commit '9f875b2717b683cc61e3fa4ba24b3693fab5b46a': Do partial reads in MemoryLeakTrackUtil
| * | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'd0e7e8012e19ac750e7858756247be1036da32c4': Do partial reads in MemoryLeakTrackUtil
| | * | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
| | |/ | | | | | | | | | | | | | | | | | | Do partial read in MemoryLeakTrackUtil dumpMemoryAddresses to avoid using more memory than what is allocated. Change-Id: I94feb4e00647407f938571167b981c7371f39e3d
* | | Remove the redundant parameters from createTrack_l()Glenn Kasten2014-01-241-62/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord::openRecord_l() code was refactored earlier to remove the redundant parameters: > Change-Id: I124dce344b1d11c2dd66ca5e2c9aec0c52c230e2 This changelist refactors AudioTrack similarly. Change-Id: Iefd2bd662870ea81d04eff7b7c26f9c8b0dadd26
* | | Refactor code related to I/O handles to reduce chance for leaksGlenn Kasten2014-01-242-45/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioRecord input handle code was refactored earlier to fix a potential handle leak, and to simplify the code: > Change-Id: I124dce344b1d11c2dd66ca5e2c9aec0c52c230e2 This changelist refactors AudioTrack similarly, and adds further cleanup of both AudioTrack and AudioRecord. We attempt to implement the rules for referencing counting I/O handles, but there is still the possibility of a handle leak if the client process dies after allocating the handle reference but before releasing it. That issue is being tracked separately. Details: - AudioSystem::getOutput() is now called within createTrack_l - restoreTrack_l was missing offload info now it has the info available, but is not yet being called for offloaded tracks - AudioTrack::getOutput() is now const - Remove getOutput_l() Change-Id: I44a0a623d24fc5847bcac0939c276400568adbca
* | | Merge "Replace control block frameCount_ by explicit in/out parameter"Glenn Kasten2014-01-244-11/+30
|\ \ \
| * | | Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-204-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | in IAudioFlinger::createTrack and IAudioFlinger::openRecord Change-Id: I09c644c80e92c8e744b1b99055988a2588b2a83d
* | | | Merge "Fix build. Missing vendor_tag header."Ruben Brunk2014-01-171-0/+1
|\ \ \ \
| * | | | Fix build. Missing vendor_tag header.Ruben Brunk2014-01-171-0/+1
| | | | |
* | | | | Merge "Use uint32_t sequence numbers for IAudioRecord"Glenn Kasten2014-01-171-1/+1
|\ \ \ \ \
| * | | | | Use uint32_t sequence numbers for IAudioRecordGlenn Kasten2014-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it the same as for IAudioTrack. Previously we had a mix of int, int32_t and uint32_t, which could cause comparisons to fail. Change-Id: Ic72ef650ee81f65db11e42ed16d818fdf3e310f4
* | | | | | am 4f8bb114: am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as ↵Marco Nelissen2014-01-173-18/+26
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | corrupted file after transfer" * commit '4f8bb114b7180fb1c4e418223b3a608b467d23a2': Long mp3 metadata displays as corrupted file after transfer
| * | | | | am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '96a7b5a9c87ec3f8cadad5bffc06a82f9f4d86d8': Long mp3 metadata displays as corrupted file after transfer
| | * | | | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
| | |\ \ \ \
| | | * | | | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cut the metadata to 1 Byte and return in function getObjectPropertyList in order to show it properly on a PC. Change-Id: Iefacf9fa86c20ece2572e6d95d35877a94066fe7
* | | | | | | Merge "Make copy of audio_offload_info_t for future use"Glenn Kasten2014-01-171-0/+10
|\ \ \ \ \ \ \
| * | | | | | | Make copy of audio_offload_info_t for future useGlenn Kasten2014-01-161-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I515970aa0660418d5d1640fb1bf477e112c89bdd
* | | | | | | | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta ↵Marco Nelissen2014-01-175-9/+89
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data in 3gp files" * commit '6146f60c87a8a9c66036325c66dea826d2e98f6f': Added support for ID3v2 meta data in 3gp files
| * | | | | | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '07a017d3ff9cb36e47649a9de28e469415eb8103': Added support for ID3v2 meta data in 3gp files
| | * | | | | | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| | |\ \ \ \ \ \
| | | * | | | | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for parsing ID3v2 meta data from the ID32 chunk in 3gp files. The priority will be 3gpp -> ID3v2 -> iTunes per field. Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
* | | | | | | | | am fea77cb3: am fd0daeb3: am 4cc47940: Merge "Fix compile error in ↵Marco Nelissen2014-01-171-1/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NuPlayerRenderer debug print" * commit 'fea77cb3c22dcb691f44b939c626ae3070212b73': Fix compile error in NuPlayerRenderer debug print
| * | | | | | | | am 4cc47940: Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4cc4794029998b21a1689794cd5bcbd5e4480ef6': Fix compile error in NuPlayerRenderer debug print
| | * | | | | | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fix compile error in NuPlayerRenderer debug printOscar Rydhé2014-01-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When activating verbose log prints in NuPlayerRenderer the build fails because a variable have changed but the log print hasn't been updated. Change-Id: I3089b087d296c37dfe6379d7e75d5892912fef96
* | | | | | | | | Merge "Move up initialization of mFormat, mStreamType, and mSharedBuffer ↵Glenn Kasten2014-01-171-3/+7
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | earlier"
| * | | | | | | | Move up initialization of mFormat, mStreamType, and mSharedBuffer earlierGlenn Kasten2014-01-161-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow removal of most of the parameter list to createTrack_l. Also check for valid stream type at client so we can log a better error message. Change-Id: Ia7176896d47fbb49106119fca26d9de8e7efe859
* | | | | | | | | Merge "Cleanup createTrack error handling"Glenn Kasten2014-01-172-1/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Cleanup createTrack error handlingGlenn Kasten2014-01-162-1/+18
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to cleanup done earlier for openRecord in this CL: > Change-Id: I84897dd7d30b370640b54e928f230604b873cb68 Bug: 10888816 Change-Id: I804a47f898e0319a60a9bd58906bbb037e45cc25
* | | | | | | | Merge "Remove dead code in AudioTrack::processAudioBuffer"Glenn Kasten2014-01-171-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove dead code in AudioTrack::processAudioBufferGlenn Kasten2014-01-161-1/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I0baefe9dc08bb5ec45d34698fc764caa160789d2
* | | | | | | Merge "Cleanup loop termination logic in AudioRecord::obtainBuffer()"Glenn Kasten2014-01-171-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Cleanup loop termination logic in AudioRecord::obtainBuffer()Glenn Kasten2014-01-161-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same change to AudioRecord, that was already done for AudioTrack in this CL: > Change-Id: I0fc48117946364cb255afd653195498891f622bd If the proxy->obtainBuffer at the end of the "do" loop fails with status DEAD_OBJECT, and the restoreRecord_l during the next trip of the "do" loop also fails, then the value of the buffer fields will be based on the previous proxy->obtainBuffer that returned DEAD_OBJECT. This will have cleared the buffer, but it's tricky. So instead explicitly clear the buffer after restoreRecord_l, before breaking out of the loop. Change-Id: Ifc97f2ab7b8195d6b149502bb5d765d2983b07be
* | | | | | | Merge "Improve logs in AudioTrack::getMinFrameCount"Glenn Kasten2014-01-171-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Improve logs in AudioTrack::getMinFrameCountGlenn Kasten2014-01-161-0/+6
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b478e6abdded26a43f32c131931939e9ae36fd7
* | | | | | | Merge "AudioRecord: fix unwanted overrun when restarting"Glenn Kasten2014-01-171-0/+3
|\ \ \ \ \ \ \
| * | | | | | | AudioRecord: fix unwanted overrun when restartingGlenn Kasten2014-01-161-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the same fix to AudioRecord as this CL did for AudioTrack: > Change-Id: Id703f8dc092a6f07c905eee194054b4a978f979d Details: When restarting an AudioRecord from stopped state, it is necessary to force refresh of mRemainingFrames by processAudioBuffer() as the last read before stop() could be partial. No doing so will lead into unnecessary sleep before filling the non contiguous part of the buffer returned by obtainBuffer() when processAudioBuffer() is executed for the first time after start(). Change-Id: I0ff04648e990e97bad5ea3db5be0c4151250d5e1
* | | | | | | Merge "AudioRecord::getInputFramesLost() cleanup"Glenn Kasten2014-01-174-8/+11
|\ \ \ \ \ \ \
| * | | | | | | AudioRecord::getInputFramesLost() cleanupGlenn Kasten2014-01-144-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug that if the binder call failed (for example if the IAudioFlinger binder is dead), then getInputFramesLost was returning garbage. Now it correctly returns zero, which is the error value for this method. The type declarations for getInputFramesLost were inconsistent: a mixture of unsigned int, size_t, and uint32_t. Now it returns uint32_t everywhere, which is what the underlying HAL API returns. Added a FIXME about the side effect behavior. This will need review for multi-client. Change-Id: Ifa2e117a87dbd0c1f2c892a31d1c3dd919bf1a0a
* | | | | | | | Merge "Unify comments between AudioTrack and AudioRecord"Glenn Kasten2014-01-172-5/+8
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Unify comments between AudioTrack and AudioRecordGlenn Kasten2014-01-142-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00a1025e2891a1c96218b3c2187eaddda6614ebc
* | | | | | | | am 07634f1f: am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position ↵Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after seeks" * commit '07634f1f8f8a899eefba978945b482dd15dabdb8': Avoid jumps to faulty position after seeks
| * | | | | | | am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '1e8a57c212d26c41325e950ed629244071acc326': Avoid jumps to faulty position after seeks
generated by cgit v1.1 at 2024-06-10 11:16:05 +0000