summaryrefslogtreecommitdiffstats
path: root/services/audioflinger
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-264-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-261-1/+1
|\ \ \ \ \
| * | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-2/+2
|\ \ \ \ \
| * | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-251-2/+2
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58
* | | | | Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-261-0/+1
|\ \ \ \ \
| * | | | | Fix uses of KeyedVectorGlenn Kasten2014-03-251-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constructor for AudioFlinger::mAudioHwDevs was missing, and so AudioFlinger::findSuitableHwDev_l() could return an undefined pointer if a non-0 module wasn't found. A KeyedVector of Plain Old Data (POD) element type must specify the default value in the constructor, or else the default will be undefined. Minor: - Parameter had wrong type in constructor for AudioSystem::gOutputs. - Remove obsolete AudioSystem::gStreamOutputMap. Change-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b
* | | | | Document AudioFlinger::nextUniqueId()Glenn Kasten2014-03-252-2/+13
|/ / / / | | | | | | | | | | | | Change-Id: Iafe96f1c10bd85cb23a2553945ca68aa601dc2eb
* | | | resolved conflicts for merge of f40c4c56 to masterGlenn Kasten2014-03-191-9/+19
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Ifd5385ad42a81e02e6a6afc6281f09fbff361671
| * | | am 36817364: Merge "Add libaudioresampler"Glenn Kasten2014-03-191-11/+18
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '36817364738d4c45adc3e448fbec02a9611bfeda': Add libaudioresampler
| | * | Add libaudioresamplerGlenn Kasten2014-03-191-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libaudioresampler is available in both 32-bit and 64-bit, unlike libaudioflinger which is currently 32-bit only. Bug: 8141282 Change-Id: I839f7b4e6aaed6984012ca6d514323f927669df6
| * | | am 77658a06: Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '77658a069c81a0d5b4a1b81443b470a3ea64cab0': AudioPolicyService: malloc/delete pair
| | * | Merge "AudioPolicyService: malloc/delete pair"Glenn Kasten2014-03-181-1/+1
| | |\ \
| | | * | AudioPolicyService: malloc/delete pairYou Kim2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75cd44ac0caccda9148faaa052c9e7a0c06d46d1 Signed-off-by: You Kim <you.kim72@gmail.com>
* | | | | audioflinger: OffloadThread fix for resume underrunHaynes Mathew George2014-03-172-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger can miss resuming h/w on a pause->resume transition if sufficient data isn't available Bug: 11358524. Change-Id: Ic3c75256290d3515fd4a96dfcc900909fbe5bc15
* | | | | AudioFlinger: Change track ready condition in STOPPING_1 stateEric Laurent2014-03-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set FS_FILLED only if framesReady() > 0 Change-Id: Ibb1d2e988ff17fcf3a7ab61031a3f85df82f18d5
* | | | | audioflinger: Handle pause /resume in stopping stateKrishnankutty Kolathappilly2014-03-173-4/+37
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Pre-requisite: Perform seek on the clip. After seek the data remaining till EOS is little more than the driver and common block buffering. -Framework state: Offload thread is waiting for signal from the HAL for a free buffer. Audio Player calls sink stop on reaching EOS. Audio track is waiting on obtain buffer for a free space in common block to send the last buffer. The track is moved to stopping state as input EOS is reached. -Issue: Perform pause/ resume in this state(STOPPING), Audio playback does not resume. -Fix Ensure resume is called in stopping state if frames ready is greater than zero. Bug: 12870871 Change-Id: Ib1378c4ee5ce4bea655691e93de0775f7b1d2804 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | Merge "move audio policy service to a separate library"Eric Laurent2014-03-183-2051/+13
|\ \ \ \
| * | | | move audio policy service to a separate libraryEric Laurent2014-03-113-2051/+13
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibc3ef07aa9860b7fd4f9aaff27b0dbe0dcbf1cbf
* | | | | Make error handling more similar for output and captureGlenn Kasten2014-03-142-40/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And simplify error case Change-Id: I0bb1ec252945d672cc4cef137977b912f1b23d51
* | | | | Make error handling for audio driver initCheck more similarGlenn Kasten2014-03-141-8/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: I8222f00f7ac89d52235af0f64f3fee7a8c471e1e
* | | | | Make session ID code similar between output and captureGlenn Kasten2014-03-141-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I873a97d0e36e1a452421df4f749d51e1916797a5
* | | | | Move declarations to where neededGlenn Kasten2014-03-141-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove unnecessary ALOGV and dead variable inFrameCount Change-Id: I34547fb0fd2ff142fc60277bedfa4064e7356611
* | | | | Remove name output parameter from createTrackGlenn Kasten2014-03-142-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used for one log. A better solution will be a per-track unique ID. Change-Id: Ia440e02ae4a5a4019a9a2d08970e1ee93ac4c3a3
* | | | | Replace if/else by switchGlenn Kasten2014-03-141-3/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibe96c8fb1f0ba7f850c0561f60769ce63aceba5d
* | | | | Whitespace and commentsGlenn Kasten2014-03-143-5/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I99752cca74a459c4746ea4718acb0115439e50bd
* | | | | Prepare for additional capture formatsGlenn Kasten2014-03-141-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib10b004f0029191b33a97671e41b0d86ebfbe0b9
* | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | * | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
| | * | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-062-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger enters a deadlock (with itself) on trying to free a RecordTrack or Track object that failed initialization. Clear this bad object from the caller instead. Bug: 12423233 Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
| * | | | am eb16bb5d: am 7028a2c8: am 7e92abea: audioflinger: fix offload write ↵Eric Laurent2014-03-051-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer offset * commit 'eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc': audioflinger: fix offload write buffer offset
| | * \ \ \ am 7e92abea: audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e92abeafb184e8a34213d7149592e95a72601b0': audioflinger: fix offload write buffer offset
| | | * | | | audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix current audio HAL write buffer offset calculation which assumes that the frame size is a multiple of 2. ' Bug: 12823725. Change-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e
| | | * | | | audioflinger: check for condition before waitingHaynes Mathew George2014-03-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncCallbackThread must check for any condition that was already been satisfied before waiting. Bug: 11824817 Change-Id: I04683a1f355de4f440106cab47fd916aa39d5e35
| * | | | | | am 632c3790: am 7c206e5b: am e0cd1051: audioflinger: update track ready ↵Haynes Mathew George2014-03-051-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition * commit '632c3790523896260dc43fd6cd40a158765cdb15': audioflinger: update track ready condition
| | * | | | | am e0cd1051: audioflinger: update track ready conditionHaynes Mathew George2014-03-051-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e0cd1051ed9fea0629745c29020516ae62298461': audioflinger: update track ready condition
| | | * | | | audioflinger: update track ready conditionHaynes Mathew George2014-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signal track ready if the track isStopping(). Bug: 12423190 Change-Id: I95e14905df10ebf301e398263478c8ca25d7e2ce
| * | | | | | am 4f9e38c6: am 21e81bca: am e010f65e: audioflinger: Fix for a deadlock in ↵Haynes Mathew George2014-03-052-2/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | | | | | | | | | | | | | | track creation * commit '4f9e38c60cc79407a8b2966b3b9780a3e395b017': audioflinger: Fix for a deadlock in track creation
| | * | | | am e010f65e: audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-052-2/+6
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e010f65e6337267cb15f8894c950a3f64370dd36': audioflinger: Fix for a deadlock in track creation
| | | * | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-042-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger enters a deadlock (with itself) on trying to free a RecordTrack or Track object that failed initialization. Clear this bad object from the caller instead. Bug: 12423233 Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
* | | | | | Fix Offload playback in AudioFlingerAndy Hung2014-03-131-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes Offload playback regression introduced by adding flexible format to mSinkBuffer. Test case is AAC file playback. Bug: 13450717 Change-Id: I0fa11978295ed4793be90c565e5b8abedf156914 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Revert "Revert "Convert AudioFlinger mSinkBuffer to flexible format""Andy Hung2014-03-132-22/+41
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e2a9c29f35e0c09782558542fc4cf9823779590e.
* | | | | | Revert "Convert AudioFlinger mSinkBuffer to flexible format"Eric Laurent2014-03-132-41/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e7e676fd2866fa4898712c4effa9e624e969c182. Bug: 13450717. Change-Id: Ib80b0d14428fecce33c62003a1fcf83f71cee03b
* | | | | | Convert AudioFlinger mSinkBuffer to flexible formatAndy Hung2014-03-102-22/+41
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Change-Id: I618d9c99a5f6f8c8d6a9f4b2d19e82c9ddc3b06e Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Add mEffectBuffer to AudioFlingerAndy Hung2014-03-102-21/+110
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icf97c50040bc127723d56eb4d2fb6e790a7253d9 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b65f6ed2f6ca3608b3a5f88f52a93af0b9b1f4a
* | | | | Merge "Use larger capture pipe since we support resampling by 6:1"Glenn Kasten2014-03-061-3/+3
|\ \ \ \ \
| * | | | | Use larger capture pipe since we support resampling by 6:1Glenn Kasten2014-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids overruns on the client AudioRecord side, without requiring client to use a large buffer. It should not increase input latency, since a newly started AudioRecord always joins the stream starting at the latest data. Change-Id: Ib2b8de75cc40a6a3d493a1f8b46b41220f69264f
* | | | | | Rename mSinkFormat to mMixerFormat for AudioMixer::track_tAndy Hung2014-03-013-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioMixer::SINK_FORMAT also changes to AudioMixer::MIXER_FORMAT Change-Id: Ic3f8be77d2c75c082c4fd140bc907e30c304d285 Signed-off-by: Andy Hung <hunga@google.com>