summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | | Merge "Fix IoConfigEvent constructor initializer list"Glenn Kasten2014-02-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix IoConfigEvent constructor initializer listGlenn Kasten2014-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fortunately this bug never showed up, because the parameter field has not been used yet. Change-Id: I2b36e2b7e1dcc2039c494fc5ea4994d262435aac
* | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-051-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | available to media code"
| * | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | | | am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '5ef74dce64a1b70534547c044a6d15533f4a9dca': audioflinger: conform inline ASM to UAL
| * | | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Clang requires some inline ASM to conform to the UAL standards (Unified Assembler Language). This fixes a small issue in this inline asm to allow building. Change-Id: Ifd9b1814343ab5ade636b9401a21d575559dac16
| * | | audioflinger: fix static track end detectionEric Laurent2014-01-301-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a static track is not a fast track, prepareTracks_l() must rely on framesReady() to detect end of buffer and remove the track from the active track list. Failing to do so results in the track staying active but not processed by the mixer because in underrun. This leaves the mix buffer content uninitialized and causes the effect process function to accumulate its output onto undefined data. Bug: 12013676. Change-Id: Iad72c921fa18d34811abf7d1073890c093a27725
* | | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-02-052-4/+4
|\ \ \ \
| * | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-01-302-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-047-42/+46
|\ \ \ \ \
| * | | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-037-42/+46
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I665ba3358dd9502f0adec70d486e7bf8a2e1b0fe
* | | | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
| | | | | | | | | | | | | | | | | | | | Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
* | | | | Merge "Fix dynamic resampling for non-NEON devices"Andy Hung2014-02-041-6/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix dynamic resampling for non-NEON devicesAndy Hung2014-02-031-6/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stride by 16 code template automatically falls back to stride by 2 (as the NEON code template override does not occur). As such the stride by 2 (in the switch) was removed as it was unnecessary. Removing the if() causes the fall back to happen properly for non-NEON compilation. Change-Id: Ia7aec6ae1d88eb54377e56e2fb57f2ae5b74cf1b Signed-off-by: Andy Hung <hunga@google.com>
* | | | Enable new dynamic audio resampler as defaultAndy Hung2014-01-302-3/+11
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default may still be overridden by af.resampler.quality in the local or build properties file. For the build properties check the relevant device.mk files. In the absence of being overridden, the 44.1 to 48kHz and 48 to 44.1kHz conversion will use the DYN_MED_QUALITY resamplers and other conversion will use the DYN_LOW_QUALITY resamplers. Change-Id: Icf9a4af5422cddc445e1904eef93984b0abe6a44 Signed-off-by: Andy Hung <hunga@google.com>
* | | Merge "Remove warnings in Audio mixer resampler compilation."Andy Hung2014-01-302-7/+27
|\ \ \
| * | | Remove warnings in Audio mixer resampler compilation.Andy Hung2014-01-292-7/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie68766142796772a54a90afdea188d0a5a78d4ac Signed-off-by: Andy Hung <hunga@google.com>
* | | | audioflinger: fix record thread exit pending checkEric Laurent2014-01-291-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecordThread loop must not release the mutex after checking for exitPending and before waiting for a new wake up condition. This can happen under the hood when methods like processConfigEvents_l() or checkForNewParameters_l() are called. So exitPending() must be checked after calling these functions. Bug: 12787961. Change-Id: Ia18c518bd5344fbb2401067303fcfe76a86879c4
* | | | Merge commit 'adf3f9b9' into manualmergeGlenn Kasten2014-01-291-5/+7
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Icdef7d075b160eb2a5ced7c57f90c6a6a4b4c64a
| * | | Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"Glenn Kasten2014-01-291-4/+7
| |\ \ \
| | * | | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-01-291-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If any track goes through AudioMixer::process__genericNoResampling, and its getnextbuffer returns NULL, Then that track is removed by AudioMixer from enabledTracks. Thus if all tracks getnextbuffer return NULL, Then this function doesn't reset outTemp and last buffer in AudioFlinger's mMixBuffer will be repeated and noise is observed. Remove tracks from enabledTracks after reseting outTemp to zero, so that process__genericNoResampling will reset outTemp and noise won't appear. Bug: 12450065 Change-Id: I1ccac7ee4a3bf7fd930254356c072099e11e7c19 Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com> Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | | | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
| |_|_|/ |/| | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
* | | | camera3: Delete output stream of bi-directional streamZhijun He2014-01-271-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bi-directional stream (like Zsl stream) is both input and output streams. When deleted, both streams need to be deleted. Change-Id: I8b6bb9054fec264cc03754003797de0bae10cb20
* | | | Merge "Camera: delete preview callback when preview size is changed"Zhijun He2014-01-271-0/+16
|\ \ \ \
| * | | | Camera: delete preview callback when preview size is changedZhijun He2014-01-241-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback stream is left configured even the preview size is changed. This makes the callback stream unnecessarily configured even in recording mode, which could cause distorted preview for some devices. Bug: 12210027 Bug: 12591410 Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
* | | | | Merge "Camera3: Flush device before ZSL reprocess"Zhijun He2014-01-272-1/+17
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2024-05-17 09:19:06 +0000