summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* Fix type of AudioTrack/AudioRecord parameter frameCountGlenn Kasten2014-02-284-24/+10
| | | | | | It's size_t consistently Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
* Fix type of AudioTrack/AudioRecord parameter notificationFramesGlenn Kasten2014-02-282-9/+9
| | | | | | It's uint32_t consistently Change-Id: If8298c7e9aeea2b951fe47b675adbdf48d104846
* Merge "Don't crash on remote read error, just return"Marco Nelissen2014-02-271-1/+4
|\
| * Don't crash on remote read error, just returnMarco Nelissen2014-02-271-1/+4
| | | | | | | | Change-Id: I35a2af255f55e008d64142ed0eceb6e83473d630
* | Fix includes to no longer pull in Skia includes directories.Derek Sollenberger2014-02-271-1/+0
| | | | | | | | | | bug:13225538 Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225
* | Simplify error handling after track creationGlenn Kasten2014-02-252-2/+6
| | | | | | | | | | | | | | IAudioFlinger::createTrack and IAudioFlinger::openRecord both guarantee that (status == OK) == (sp<> != 0). Change-Id: I91cb4f7e843019efb65cace7ba146f7da7aa5b59
* | Move initialize of mInput to match AudioTrackGlenn Kasten2014-02-251-3/+3
| | | | | | | | Change-Id: I4dc977f22f51cd618dc83d800b4b8756929a4612
* | Update comments to match AudioTrackGlenn Kasten2014-02-251-1/+3
| | | | | | | | Change-Id: I7dd14eabd78c9130a157da2063a1d65ec4f9c65a
* | Move initialization of mRefreshRemaining to match AudioTrackGlenn Kasten2014-02-251-1/+2
| | | | | | | | | | | | | | This also fixes a bug where, for a re-created IAudioRecord, mRefreshRemaining was not being reset correctly. Change-Id: I9f721a4edf92aab859cf3f247ab7f65562d14fb0
* | Merge "mAudioRecord is always non-0 if set() is successful"Glenn Kasten2014-02-251-4/+4
|\ \
| * | mAudioRecord is always non-0 if set() is successfulGlenn Kasten2014-02-241-4/+4
| | | | | | | | | | | | Change-Id: I0c2483210903c922f06f097ada373a37b9a90a02
* | | Merge "Unify comments and whitespace between AudioTrack and AudioRecord"Glenn Kasten2014-02-252-1/+5
|\ \ \ | |/ /
| * | Unify comments and whitespace between AudioTrack and AudioRecordGlenn Kasten2014-02-242-1/+5
| | | | | | | | | | | | Change-Id: I5320a6b2d7f7077cb12d7da4f2ca30a940100bf2
* | | Merge "Update channel fields at same place in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-4/+3
|\ \ \ | |/ /
| * | Update channel fields at same place in AudioTrack and AudioRecordGlenn Kasten2014-02-241-4/+3
| | | | | | | | | | | | Change-Id: I4b649feeef47e7968a9fa3a460217017ca9b05fe
* | | Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord"Glenn Kasten2014-02-251-5/+5
|\ \ \ | |/ /
| * | Update mReqFrameCount at same point in AudioTrack and AudioRecordGlenn Kasten2014-02-241-5/+5
| | | | | | | | | | | | Change-Id: I12369dfbb9e75389f2cab015a706decdaf310a0d
* | | 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
|\ \ \ | |/ / |/| |