summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Move up AudioFlinger::createTrack and openRecord parameter checks"Glenn Kasten2014-02-271-1/+32
|\
| * Move up AudioFlinger::createTrack and openRecord parameter checksGlenn Kasten2014-02-271-1/+32
| | | | | | | | | | | | | | | | Perform the basic sample rate, format, and channel masks tests as early as possible. Now the thread methods only need to do the thread type-specific checks. Change-Id: I57d8319a228dda0446ca9b3ddcb7c9f67f28238c
* | Merge "Add Track Sink Format to AudioMixer"Andy Hung2014-02-272-23/+72
|\ \ | |/ |/|
| * Add Track Sink Format to AudioMixerAndy Hung2014-02-262-23/+72
| | | | | | | | | | | | | | | | | | Track Sink Format now allows both AUDIO_FORMAT_PCM_FLOAT and AUDIO_FORMAT_PCM_16_BIT (default). The float case is not enabled now. Change-Id: Ibee70cab4725c8bc9905e49f1f9a9c2448f76e00 Signed-off-by: Andy Hung <hunga@google.com>
* | Merge "Fix 1:1 dynamic resampler rate setting"Andy Hung2014-02-251-0/+4
|\ \
| * | Fix 1:1 dynamic resampler rate settingAndy Hung2014-02-191-0/+4
| | | | | | | | | | | | | | | Change-Id: Id69e98ebaaca8dd8c976eb823f1cc1024b0eddf5 Signed-off-by: Andy Hung <hunga@google.com>
* | | Merge "The -O option now takes a CSV instead of a single value"Glenn Kasten2014-02-241-12/+81
|\ \ \
| * | | The -O option now takes a CSV instead of a single valueGlenn Kasten2014-02-211-12/+81
| | |/ | |/| | | | | | | | | | | | | Also added -P option to provide a CSV list of provided values. Change-Id: I4e0d6fe8b062d27d95d33493f80bd8f1c510d2c8
* | | Merge "camera2: Fix race with stream deletion during disconnect."Ruben Brunk2014-02-241-6/+8
|\ \ \
| * | | camera2: Fix race with stream deletion during disconnect.Ruben Brunk2013-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11856804 - Shutdown order in Camera2Client allows a stream to be deleted before the corresponding processing thread has quit. This can result in updates being called on the processor thread without a valid stream.
* | | | Merge "Account for unreleased frames when predicting resampler needs"Glenn Kasten2014-02-221-20/+28
|\ \ \ \
| * | | | Account for unreleased frames when predicting resampler needsGlenn Kasten2014-02-211-20/+28
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other changes related to resampling: - improve logs - use correct form of assert - don't round up max usable circular buffer sizes to power of 2; this gives more predictable results - add some FIXMEs Bug: 13133176 Change-Id: I8d3c90eed4eb0c0c1fbac3c864e179a2806c2301
* | | | Merge "Make tee sink work again"Glenn Kasten2014-02-212-2/+3
|\ \ \ \
| * | | | Make tee sink work againGlenn Kasten2014-02-212-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken by this earlier change to NBAIO: > Change-Id: I5eda412648b094358f5eefc38300e9ec8a734cd3 But the code was not being compiled, so the error was not caught earlier. Also increase the default size of per-track pipe to a reasonable value. Change-Id: Ica05017e6c6533e1fea9df379a9b204eebed4a1f
* | | | audioflinger: fix race condition in SyncEvent callbackEric Laurent2014-02-203-7/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that the SyncEvent callback is implemented by the RecordTrack instead of the RecordThread, there is a possibility that the callback is called after the track deletion. SyncEvent callback now uses a weak pointer instead of a raw pointer as cookie. This allows the callback implementer to acquire a strong reference on the object pointed to by the cookie. Bug: 13114128. Change-Id: Id61b8f06044ed1e52c6f7e7c666cdede68340de2
* | | Allow specifying frames per call to resample()Glenn Kasten2014-02-191-3/+15
| | | | | | | | | | | | | | | Bug: 13073201 Change-Id: Id2f0fcd7562d9ba5a58c128d71bbba42dfea86cc
* | | Merge "Fix resampler to allow output of single frame"Andy Hung2014-02-195-6/+38
|\ \ \
| * | | Fix resampler to allow output of single frameAndy Hung2014-02-195-6/+38
| | |/ | |/| | | | | | | | | | | | | Bug: 13073201 Change-Id: If7818a3389a191a37277bbd8e96a59ef8ce68509 Signed-off-by: Andy Hung <hunga@google.com>
* | | Multi-client recording continuedGlenn Kasten2014-02-183-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mReqChannelCount and mReqSampleRate. Increase number of input frames needed for sample rate converter. Add TODO comments to investigate later. Fix bugs in sample rate conversion. Change-Id: I3aa54b862843d518b6e4ece9a7f52fd27d741629
* | | Move handleSyncStartEvent and clearSyncStartEvent to RecordTrackGlenn Kasten2014-02-184-34/+33
| | | | | | | | | | | | Change-Id: I611a63e63acf3eb17e2072c1a77b91fe9e62e36a
* | | Add _l suffix to readInputParameters/OutputParametersGlenn Kasten2014-02-183-17/+17
| | | | | | | | | | | | | | | | | | | | | They are always called while thread mutex is locked, or in the thread constructor. Change-Id: I56df71563a52a5cd6cea6fc0914df993519e1b74
* | | Multi-client recordingGlenn Kasten2014-02-185-318/+408
|/ / | | | | | | | | | | Supports multiple clients both at native sample rate and with resampling. Change-Id: Icea55b4fd30751761b7debaa3ce016c79e712d8d
* | Merge "Track pid for each session"Marco Nelissen2014-02-132-7/+13
|\ \
| * | Track pid for each sessionMarco Nelissen2014-02-112-7/+13
| | | | | | | | | | | | | | | | | | so they can be properly freed. Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
* | | Merge "Proper adjustment of filterlength for downsampling"Andy Hung2014-02-121-6/+14
|\ \ \ | |/ / |/| |
| * | Proper adjustment of filterlength for downsamplingAndy Hung2014-02-111-6/+14
| | | | | | | | | | | | | | | | | | Bug: 12963040 Change-Id: I772b8efd3f7eae6d075994b210dd0168f5365f4d Signed-off-by: Andy Hung <hunga@google.com>
* | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-1117-57/+72
|\ \ \ | | | | | | | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1117-58/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Fix clang warnings in AudioFlinger"Glenn Kasten2014-02-107-25/+28
|\ \ \ \
| * | | | Fix clang warnings in AudioFlingerGlenn Kasten2014-02-107-25/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: I0fa61025c979709ad7d655bc717df5f194b6089e
* | | | | am 5a458ede: am 5930e8eb: Merge "AudioFlinger: Remove code for supporting ↵Glenn Kasten2014-02-104-26/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | resampling in fast tracks" * commit '5a458ede3b7d303723fde4b856532bdc3b94971b': AudioFlinger: Remove code for supporting resampling in fast tracks
| * | | | Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"Glenn Kasten2014-02-104-26/+5
| |\ \ \ \
| | * | | | AudioFlinger: Remove code for supporting resampling in fast tracksMartin Storsjo2014-02-054-26/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't used at the moment. Change-Id: I4e0fb2af5f7d959dbafd5ddb7defa1c6b8e8636a
* | | | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path ↵Glenn Kasten2014-02-102-5/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if resampling is required" * commit '4e12dadeec10993d2f77cce96600e73ca0dd86e2': AudioTrack: Never try to use the fast path if resampling is required
| * | | | | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-102-5/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-312-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Pretty up audioflinger dumpsys"Marco Nelissen2014-02-108-190/+374
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Pretty up audioflinger dumpsysMarco Nelissen2014-02-108-190/+374
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I57e44b4c36b99f7149542bbcf9645521c6152dfa
* | | | | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-102-12/+12
|\ \ \ \ \
| * | | | | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-072-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1c611d1037685d52ccc84efe0fccd6413ec938e9
* | | | | | Merge "Fix whitespace"Glenn Kasten2014-02-074-18/+19
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix whitespaceGlenn Kasten2014-02-074-18/+19
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9add0872030a26933f6b6dad1be299154611cc56
* | | | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"Glenn Kasten2014-02-073-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use Format_isValid() and Format_isEqual() instead of direct comparisonGlenn Kasten2014-02-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie87607aa514976947540a77775e6425c4e56e7d9
* | | | | | Merge "AudioFlinger: Offload track transition fix"Eric Laurent2014-02-072-5/+21
|\ \ \ \ \ \
| * | | | | | AudioFlinger: Offload track transition fixHaynes Mathew George2014-02-062-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trigger state changes in OffloadThread on adding a new offload track. Bug: 12530661 Change-Id: I95b62764c7ac041d470702e86b951f812eb0e70f
* | | | | | | Merge "AudioFlinger: Modify flush handling for offload path"Eric Laurent2014-02-074-15/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioFlinger: Modify flush handling for offload pathHaynes Mathew George2014-02-064-15/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow an offload track to directly control the offload thread behavior. OffloadThread can check for any pending flush reporting by its active tracks and decide to flush the HW or not. Bug: 12530661 Change-Id: Ib33f023c942f6c091b618004136b153c38a6eef6
* | | | | | | Merge "audioflinger: OffloadThread state fix"Eric Laurent2014-02-071-3/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | audioflinger: OffloadThread state fixHaynes Mathew George2014-02-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When switching from one offload session to another that reuses the same offload output, audio HAL is paused & flushed in preparation for the new track OffloadThread must reset mHwPaused to allow proper state transitions for the second track. In addition, Offload thread need not explicitly call resume on HAL while handling a flush. Bug: 12530661 Change-Id: I8173845e1782b5a8b372a82c7d337299a61e0efe