summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-074-6/+5
| | | | Change-Id: I4b65f6ed2f6ca3608b3a5f88f52a93af0b9b1f4a
* Merge "Remove checks for specific sample rates and channel counts"Glenn Kasten2014-03-071-18/+0
|\
| * Remove checks for specific sample rates and channel countsGlenn Kasten2014-03-061-18/+0
| | | | | | | | Change-Id: Idadfe7c11dc831e82f95015f02dd9b9861b401c8
* | Merge "Remove restriction for HAL streams of AUDIO_FORMAT_PCM_16_BIT"Glenn Kasten2014-03-072-14/+10
|\ \ | |/
| * Remove restriction for HAL streams of AUDIO_FORMAT_PCM_16_BITGlenn Kasten2014-03-062-14/+10
| | | | | | | | Change-Id: I6b89a3ac4b77b9a5a84e3b623987186c3d2db89d
* | am 40659dea: am 47ef192f: am a11111f9: Merge changes ↵Eino-Ville Talvala2014-03-070-0/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Id28b35fd,Ie4e64977,I2950f31e into klp-dev * commit '40659dea8eefaa9d7f5b742e3333d68b6f0dd89c': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| * \ am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into ↵Eino-Ville Talvala2014-03-073-55/+66
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '47ef192f0296642b901e82d0c72c5a1a0d08f4df': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | * \ am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | | * \ Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | | | * | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
| | | | * | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-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. Change-Id: Ie4e649771f4321498659211f2a37ed89a6d956c4
| | | | * | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jpeg stream in JpegProcessor could be deleted while process new capture is ongoing, which unsafe to access a dead consumer endpoint. Bug: 9316454 Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
* | | | | | am 51b7125b: am bfc26066: am ed4d8b28: Merge "stagefright: do not offload ↵Eric Laurent2014-03-070-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LD-AAC decoding" into klp-dev * commit '51b7125bd0e2127f1d57938e95523dcc61e657ef': stagefright: do not offload LD-AAC decoding
| * | | | | am bfc26066: am ed4d8b28: Merge "stagefright: do not offload LD-AAC ↵Eric Laurent2014-03-070-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoding" into klp-dev * commit 'bfc260667e566d4ea29c8b1d089b95ce2c11890c': stagefright: do not offload LD-AAC decoding
| | * | | | am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-070-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258': stagefright: do not offload LD-AAC decoding
| | | * | | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-073-0/+15
| | | |\ \ \
| | | | * | | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-063-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am 8f379f63: am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading ↵Eric Laurent2014-03-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HE-AAC sampling rate." into klp-dev * commit '8f379f63a525a82965e5926490747db9f7241e8f': stagefright: fix offloading HE-AAC sampling rate.
| * | | | | | am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling ↵Eric Laurent2014-03-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rate." into klp-dev * commit '4ed0b0b6f1fb1adab5df6342d03a695545a18be3': stagefright: fix offloading HE-AAC sampling rate.
| | * | | | | am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into ↵Eric Laurent2014-03-060-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '880413f7923ec77467243e15dc34d4af4f8064f9': stagefright: fix offloading HE-AAC sampling rate.
| | | * | | | Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-devEric Laurent2014-03-061-17/+23
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2014-03-051-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix HE AAC SBR sampling rate reading for explicit signaling. Bug: 11697128. Change-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c
* | | | | | | am afa5263f: am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track ↵Glenn Kasten2014-03-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation" * commit 'afa5263f7f29affc77ff05d9c0a1b53e598531fa': audioflinger: Fix for a deadlock in track creation
| * | | | | | am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-060-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '395c2fc0c422c9218f39f6ed2040e90b1cc9920a': audioflinger: Fix for a deadlock in track creation
| | * \ \ \ \ \ Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-062-2/+5
| | |\ \ \ \ \ \
| | | * | | | | | 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 eff98dde: am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eff98ddea36264d028c0811c96b112a52977b51c': set AAC MPEG version to MPEG-2
| * | | | | | | am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '2b6191fddb1f4a750ad03792d09d4b8efdeeb35a': set AAC MPEG version to MPEG-2
| | * | | | | | am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '3b7ddf83db2d11c08116a6476c0f11e71bd72ba4': set AAC MPEG version to MPEG-2
| | | * | | | | set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wifi display play spec only allows MPEG-2 AAC. Bug: 12747927 Change-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817
* | | | | | | Merge "Simplify AudioTrack stream end and fix race"Glenn Kasten2014-03-071-17/+15
|\ \ \ \ \ \ \
| * | | | | | | Simplify AudioTrack stream end and fix raceGlenn Kasten2013-09-291-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10994052 Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
* | | | | | | | Merge "Remove Format_frameBitShift()"Glenn Kasten2014-03-076-10/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove Format_frameBitShift()Glenn Kasten2014-03-066-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iae2e80a7330c5dd0f70a263051aa44c23cfe3541
* | | | | | | | Merge "Re-implement Format_frameSize(), to support non-power-of-2"Glenn Kasten2014-03-071-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Re-implement Format_frameSize(), to support non-power-of-2Glenn Kasten2014-03-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I671bd4f03ce70de685770fd7992e2e023133c9b4
* | | | | | | | Merge "Split mPacked into 4 separate fields"Glenn Kasten2014-03-062-71/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Split mPacked into 4 separate fieldsGlenn Kasten2014-03-062-71/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I940324dce9b51fd8d7e2e362e12ad74b70e658dd
* | | | | | | | Merge "Add format parameter to Format_from_SR_C"Glenn Kasten2014-03-062-3/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add format parameter to Format_from_SR_CGlenn Kasten2014-03-062-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I891138b7754342fe2a4f02de30ee616dbd078474
* | | | | | | | Merge "Use mFrameSize instead of mBitShift"Glenn Kasten2014-03-0610-20/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Use mFrameSize instead of mBitShiftGlenn Kasten2014-03-0610-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idac335ae70cc9300bb3325839fe8ef1e9e097245
* | | | | | | | Merge "AudioTrack: When paused, return cached playback position"Eric Laurent2014-03-062-3/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-062-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: I324112ea9827e52fff53ef44cd8513c8d85a0bc4
* | | | | | | | | Merge "Add mFrameSize but do not remove mFrameBitShift yet"Glenn Kasten2014-03-065-2/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Add mFrameSize but do not remove mFrameBitShift yetGlenn Kasten2014-03-065-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb1edefeb6a0e659503f6b7a92c9d15784df9865
* | | | | | | | Merge "audio policy service: clean up type casting."Eric Laurent2014-03-061-6/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | audio policy service: clean up type casting.Eric Laurent2014-03-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If16d6495c16e0d61a221f81bfd49e7d14bbfdc12
* | | | | | | | | 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
generated by cgit v1.1 at 2024-06-26 21:02:31 +0000