summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Permit AudioRecord to support non-linear formats in future"Glenn Kasten2014-02-251-2/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Permit AudioRecord to support non-linear formats in futureGlenn Kasten2014-02-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | But still restricted to 16-bit PCM currently Change-Id: I5df0e5033da9144ca73e44addf14a63d31406034
* | | | | | | | | Merge "Simplify and cleanup error handling in AudioRecord::getMinFrameCount"Glenn Kasten2014-02-251-17/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Simplify and cleanup error handling in AudioRecord::getMinFrameCountGlenn Kasten2014-02-251-17/+10
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8721ecedfb429c4e233453d1e768ddf69ecabbe4
* | | | | | | | | Merge "Add log at entry to set() in AudioTrack and AudioRecord"Glenn Kasten2014-02-252-3/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add log at entry to set() in AudioTrack and AudioRecordGlenn Kasten2014-02-242-3/+10
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Ife23b88474c1d62c0cf682c1a310d951f2c0f54a
* | | | | | | Add method to get redirected UriMarco Nelissen2014-02-211-0/+21
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: Id8aac1077c3de1bb1f58bfcfcca93d685abe9b79
* | | | | | Merge "Simplify and remove old comment"Glenn Kasten2014-02-181-3/+1
|\ \ \ \ \ \
| * | | | | | Simplify and remove old commentGlenn Kasten2014-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee41641252f65cea9ce0ea0ec1ea4229608f7c64
* | | | | | | Multi-client recordingGlenn Kasten2014-02-181-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supports multiple clients both at native sample rate and with resampling. Change-Id: Icea55b4fd30751761b7debaa3ce016c79e712d8d
* | | | | | Merge "Move StateQueueInstantiations to libinstantssq"Glenn Kasten2014-02-181-6/+16
|\ \ \ \ \ \
| * | | | | | Move StateQueueInstantiations to libinstantssqGlenn Kasten2014-02-181-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a circular dependency between libmedia and libnbaio Change-Id: I3692cbbe2b76028a953b36606b62cdda70c8c26f
* | | | | | | Fix warning due to incorrect log formatGlenn Kasten2014-02-181-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I58ff399ace74965ebf8e5690c20637385f9425ad
* | | | | | Track pid for each sessionMarco Nelissen2014-02-115-22/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so they can be properly freed. Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
* | | | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-113-9/+9
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-113-10/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | | | | Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I1cd3432c02db1600e49ade67e6a89e39e7a8d3ed
* | | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path ↵Glenn Kasten2014-02-101-0/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | if resampling is required" * commit '4e12dadeec10993d2f77cce96600e73ca0dd86e2': AudioTrack: Never try to use the fast path if resampling is required
| * | | | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-311-0/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless AudioFlinger was built with FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE enabled, AudioFlinger would deny using the fast path (and internally fall back to the normal codepath) when it realized that resampling was required. Since the buffer size calculations within AudioFlinger don't take resampling into account properly (see the calculation below "AUDIO_OUTPUT_FLAG_FAST denied" in audioflinger/Threads.cpp, just below the hunk that this patch changes), make sure AudioTrack doesn't try to use the fast path if resampling is required. This removes the possibility to enable FAST_TRACKS_AT_NON_NATIVE_SAMPLE_RATE in AudioFlinger since it AudioTrack now won't even try to use the fast path for content that requires resampling, regardless of the AudioFlinger configuration. Change-Id: Icf0f8ad50bf0fdb84657f518c0120aa0535f23f9
* | | | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-103-7/+7
|\ \ \ \
| * | | | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-073-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I1c611d1037685d52ccc84efe0fccd6413ec938e9
* | | | | Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-071-7/+13
|\ \ \ \ \
| * | | | | Fix warnings about unused parametersGlenn Kasten2014-02-071-7/+13
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I27dc108e2c1f7ffd414bb7ff3d4c349651da6c26
* | | | | Fix whitespaceGlenn Kasten2014-02-072-13/+26
|/ / / / | | | | | | | | | | | | Change-Id: I9add0872030a26933f6b6dad1be299154611cc56
* | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-062-49/+0
|\ \ \ \
| * | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-052-49/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-051-7/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-051-7/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: I62d6534a9581e84ae20c2422f7ad9aeda9b7c4df
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-059-16/+303
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | available to media code"
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-049-16/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-043-4/+4
|\ \ \ \ \
| * | | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-033-4/+4
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I665ba3358dd9502f0adec70d486e7bf8a2e1b0fe
* | | | | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-031-6/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-01-281-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventually we may want to use uint64_t, but will need to confirm atomicity. Bug: 12381724 Change-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865
* | | | | AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-01-272-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::obtainBuffer() passes a pointer to a timeout variable that has gone out of scope when calling ClientProxy::obtainBuffer(). Same fix for AudioRecord. Bug: 11968591. Change-Id: I22af8f94fa2f8cc54ab5c25c89167c805e754317
* | | | 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
| * | | 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
| * | | AudioTrack: fix position callback after restoreEric Laurent2013-12-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When restoring an AudioTrack, the next position callback point should not be modified and set ahead of current buffer head. Otherwise, as frames are dropped, the new position is never reached and an application relying on position callbacks to reload the buffer would be stalled. Bug: 11868603. Change-Id: I93b2a311642a0c89944b78bcc0482d4ceed98ae4
| * | | update offloaded audio track sampling rateEric Laurent2013-12-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPlayer must read the sampling rate from offloaded audio sinks whenever a new time position is computed as the decoder can update the sampling rate on the fly. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
* | | | 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 "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
* | | | | | 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
* | | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / /