summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | CameraService: fix race condition and wrong last frame number.Jianing Wei2014-04-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2be9a77a0b074497615de38cbb8e8f13b4858ec
* | | | | | | | | | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| * | | | | | | | | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| | * | | | | | | | | media: 64 bit compile issuesMark Salyzyn2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
| * | | | | | | | | | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * | | | | | | | | warnings be gone.Andreas Huber2014-04-111-1/+1
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | | | | | | | | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-103-8/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of tracking CameraMetadata only, now we track both CameraMetadata and CaptureResultExtras, which is not part of the HAL metadata. This will enable the correct callback of onCaptureStarted and onResultReceived given burst requests. * Get last frame number in reply when submitting requests, canceling requests, and flushing device. For repeating requests, this frame number is the last frame number of the previous request. For non-repeating requests, this frame number is the expected last frame number of the current request. The goal is provide frame number to Java side in order to trigger onCaptureSequenceCompleted correctly. * Fix notifyError so that onDeviceError can be called correctly. Bug: 10749500 Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
* | | | | | | | | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added property media.stagefright.log-uri. Set it to true or 1 to log uris by AwesomePlayer. Added utility function to get uri debug string based on incognito and log opt-in status. Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec Related-Bug: 6994761
* | | | | | | | | | stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
* | | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-041-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
* | | | | | | | | | | Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"Lajos Molnar2014-04-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ACodec: do not signal kWhatShutdownCompleted on codec errorLajos Molnar2014-04-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not signal kWhatShutdownCompleted when moving to Uninitialized state due to receiving a codec error. Do not abort if error happens just before handling a stop request. Bug: 13675112 Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
* | | | | | | | | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * | | | | | | | | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| | * | | | | | | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
| * | | | | | | | | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep ↵Lajos Molnar2014-03-281-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more buffers with the BufferQueue"" into klp-dev * commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | * | | | | | | | | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers ↵Lajos Molnar2014-03-281-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the BufferQueue"" into klp-dev * commit 'f780d28de2e3cf7f6b26b9626321dba75719736e': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | | * \ \ \ \ \ \ \ \ \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the ↵Lajos Molnar2014-03-281-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | BufferQueue"" into klp-dev
| | | | * | | | | | | | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-271-1/+0
| | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829. Bug: 13655631
| * | | | | | | | | | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for ↵Igor Murashkin2014-03-251-0/+203
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview FPS single/range values * commit '65550a0e17852fe657795508e3bf05bdbfb2520b': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | * | | | | | | | | | am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-251-0/+203
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | | * | | | | | | | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-251-0/+203
| | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
| * | | | | | | | | | am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cde517297827156de1c3b2ff54e272a5d4ae7c3': mediaplayer: keep more buffers with the BufferQueue
| | * | | | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b635b0e66b257ab442e230bca96afd5105cf6829': mediaplayer: keep more buffers with the BufferQueue
| | | * | | | | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change OMX buffer allocation policy to allocate nBufferCountMin + what is required for the BQ. For the BQ, try to allocate 2 additional buffers than the minimum undequeued count. Also account for the fact that BQ may return one less than the actual minimum undequeued count. In most cases the resulting number of buffers ends up being the same as with the previous policy, but we keep more buffers with the BQ. Change-Id: I826db8bf7dd333b620299dba60bf1b81b228275d Bug: 13170236
| * | | | | | | | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to ↵Chong Zhang2014-03-132-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | specified value" into klp-dev * commit 'a671f943b72155460f0c94cdd92d829cb059b571': Cap pts gap between adjacent frames to specified value
| | * | | | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-132-0/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| | | * | | | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-112-0/+2
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In the scenario of cast mirroring, encoding could be suspended for prolonged periods. Limiting the pts gap to workaround the problem where encoder's rate control logic produces huge frames after a long period of suspension. - Repeat last frame a couple more times to get better quality on static scenes. - Fix the timestamp on repeat frames (it was not set) Bug: 11971963 Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7 (cherry picked from commit 94ee4b708acfa941581160b267afb79192b1d816)
| * | | | | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached ↵Eric Laurent2014-03-081-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback position" into klp-dev * commit '38efe8eb08e08610d535a164768851ac7c13d654': AudioTrack: When paused, return cached playback position
| | * | | | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-0/+1
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * | | | | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-0/+1
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | * | | | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An offload output can be re-used between two audio tracks having the same configuration. A timestamp query for a paused track while the other is running would return an incorrect time. To fix this, cache the playback position on a pause() and return this time when requested until the track is resumed. Bug: 12826612. Change-Id: Ia42b8b8fd2ba8993dfcc9abca72da48d71d78d74
| * | | | | | | | am 72d09f62: am 2613347d: Merge "Added support to query ACodec whether ↵Lajos Molnar2014-03-071-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adaptive playback is enabled." into klp-dev * commit '72d09f6280cd701e48922a86df0d2e5f4e61cd8e': Added support to query ACodec whether adaptive playback is enabled.
| | * | | | | | | am 2613347d: Merge "Added support to query ACodec whether adaptive playback ↵Lajos Molnar2014-03-071-0/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled." into klp-dev * commit '2613347d74c3f35bc6fda5df1c29c1119c22d432': Added support to query ACodec whether adaptive playback is enabled.
| | | * | | | | | Merge "Added support to query ACodec whether adaptive playback is enabled." ↵Lajos Molnar2014-03-071-0/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | into klp-dev
| | | | * | | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I6b0308aa8550c643706959277e46dad586c37297
| | | * | | | | | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-061-0/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, do not offload LD and ELD AAC decoding because there is no way to know if it is supported by the audio DSP implementation. The longer term fix will be to have mapMimeToAudioFormat() use the audio object type in track metadata to refine the AAC format and the audio HAL list supported AAC profiles. Bug: 11697128. Change-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147
| | | * | | | | update offloaded audio track sampling rateEric Laurent2014-03-053-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Bug: 12823955. Change-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88
| | * | | | | | am 6b260425: am 85b3013e: fix deadlock issues that arise when there are ↵jpadmana2014-03-051-24/+0
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds * commit '6b2604259c12ee28b49f26ab2adac96eefe30934': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| | | * | | | | am 85b3013e: fix deadlock issues that arise when there are simultaneous ↵jpadmana2014-03-051-24/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds * commit '85b3013e06e8fe7802fe6259ecac80261e834332': fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
| | | | * | | | fix deadlock issues that arise when there are simultaneousjpadmana2014-03-041-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds Whenever there are parallel calls to proxy and non sub-effects wrappers, some of the calls are not completed. This is due to deadlock arsing out of Proxy waiting for the subeffect call to return and subeffect waiting for proxy to release lock. The call flow is changed to a cleaner and simple one - Proxy gets the aeli(effect library info) of subeffects during the EffectGetSubEffects() call. Therby, proxy will manage the sub effects by itself rather than going through effects factory. Change-Id: If4b259da5776f151c1e81a78a0239d342046d923 Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com> Bug: 12424044
| * | | | | | | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-132-6/+18
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'af191eb4feac513d17dc0362e0cea5bc9e0ffe9d': Replace size_t in shared memory by uint32_t
| | * | | | | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-132-6/+18
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eventually we may want to use uint64_t, but will need to confirm atomicity. Bug: 12381724 Change-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865
* | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-262-4/+5
|\ \ \ \ \ \ \
| * | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-262-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
* | | | | | | | Update commentsGlenn Kasten2014-03-262-10/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I5776313b9b49072cd666d28880f0d07cc73f827b
* | | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-261-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | | | | | | Merge "Remove stream type from AudioSystem::getRenderPosition()"Glenn Kasten2014-03-261-4/+2
|\ \ \ \ \ \ \ \