summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Camera: Add HDR scene mode constants." into jb-mr1-devEino-Ville Talvala2012-09-112-0/+5
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Camera: Add HDR scene mode constants.Eino-Ville Talvala2012-09-102-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
* | | | | | | | | Merge "Communicate audio session ID to downmixer" into jb-mr1-devJean-Michel Trivi2012-09-115-14/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Communicate audio session ID to downmixerJean-Michel Trivi2012-09-105-14/+17
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio downmixer effect might need the audio session Id, pass it from the track creation in AudioFlinger to the downmix effect creation in AudioMixer. Change-Id: I5e29540542ae89cf4a0cdb537b3e67f04442a20a
* | | | | | | | | am ed757e97: am 290ac693: Merge "Stop building the unused host libmtp static ↵Elliott Hughes2012-09-111-28/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | library." * commit 'ed757e9729b325f00e70f506ad6e217910563d0a': Stop building the unused host libmtp static library.
| * | | | | | | am 290ac693: Merge "Stop building the unused host libmtp static library."Elliott Hughes2012-09-111-28/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '290ac69379e649a2fed1d9441a17e39c6a912d8c': Stop building the unused host libmtp static library.
| | * | | | | | Merge "Stop building the unused host libmtp static library."Elliott Hughes2012-09-111-28/+0
| | |\ \ \ \ \ \
| | | * | | | | | Stop building the unused host libmtp static library.Elliott Hughes2012-09-111-28/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need to support the bionic mktime_tz and localtime_tz extensions on glibc, which makes my life easier. Bug: 7012465 Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
* | | | | | | | Merge "Limit maximum equalizer gain." into jb-mr1-devEric Laurent2012-09-112-40/+68
|\ \ \ \ \ \ \ \
| * | | | | | | | Limit maximum equalizer gain.Eric Laurent2012-09-102-40/+68
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit maximum gain in all EQ bands according to current volume so that total gain (current volume + band gain) does not exceed a certain limit. The gain difference between bands is preserved. Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
* | | | | | | | Merge "Camera2: Temporarily stop pre-allocation of recording stream." into ↵Eino-Ville Talvala2012-09-101-7/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | Camera2: Temporarily stop pre-allocation of recording stream.Eino-Ville Talvala2012-09-101-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recordingHint is set, don't pre-allocate recording stream on preview start. Bug: 7137947 Change-Id: I06b5f6d7dbb21d4d0747974ba001b0c8929a0b02
* | | | | | | | Merge "Camera2: Clean up the right streams." into jb-mr1-devEino-Ville Talvala2012-09-101-3/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Camera2: Clean up the right streams.Eino-Ville Talvala2012-09-101-3/+16
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48
* | | | | | | Merge "audio effects: no audio preprocessing by default" into jb-mr1-devEric Laurent2012-09-101-15/+24
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | audio effects: no audio preprocessing by defaultEric Laurent2012-09-101-15/+24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio preprocessings are not included in the default audio_effect.conf file anymore as the audio HAL has to provide support for them. Each product implementing one or more audio pre processing must provide a specific audio_effects.conf file. Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
* | | | | | Merge "Enable audio streaming to a wifi display. Remove startup delay hack." ↵Andreas Huber2012-09-102-11/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | Enable audio streaming to a wifi display. Remove startup delay hack.Andreas Huber2012-09-102-11/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca
* | | | | | am f755a506: am d81be6d6: Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'f755a506335df3bfb32c062096deceaf045044ed': aacenc: Mark some global arrays const
| * | | | | am d81be6d6: Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'd81be6d670f0d89aa6048a82fbbff82c584e9922': aacenc: Mark some global arrays const
| | * | | | Merge "aacenc: Mark some global arrays const"Jean-Baptiste Queru2012-09-103-3/+3
| | |\ \ \ \
| | | * | | | aacenc: Mark some global arrays constMartin Storsjo2012-09-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets rid of initialized writeable data in the library. Change-Id: I7c1cbeb3df10c302b645b7311591ead87a289ca1
* | | | | | | Camera2: Use face priority scene mode when face detect is enabled.Eino-Ville Talvala2012-09-101-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per API specs, enabled face detection implies that metering, etc is done based on faces. Bug: 6243944 Change-Id: Ie35162226d70cc0f437e92e37be138e71e45e738
* | | | | | | Camera2: Sanity check inputs better.Eino-Ville Talvala2012-09-101-0/+16
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 7132141 Change-Id: I866a65dfe47464070a6ef4ac60be4801cb68327b
* | | | | | am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get ↵Elliott Hughes2012-09-094-4/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expat header files from the approved location." * commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3': Fix libmedia and libstagefright to get expat header files from the approved location.
| * | | | | am 5abc91d6: Merge "Fix libmedia and libstagefright to get expat header ↵Elliott Hughes2012-09-094-4/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files from the approved location." * commit '5abc91d61718e334e05c6d4858bd868bd5a5769c': Fix libmedia and libstagefright to get expat header files from the approved location.
| | * | | | Merge "Fix libmedia and libstagefright to get expat header files from the ↵Elliott Hughes2012-09-094-4/+2
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | approved location."
| | | * | | Fix libmedia and libstagefright to get expat header files from the approved ↵Elliott Hughes2012-09-094-4/+2
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location. Found during a libexpat upgrade. Change-Id: I9e5abd502a884975d898486edde374fb2519164e
* | | | | Merge "Add outlier statistics for fast mixer cycle times" into jb-mr1-devGlenn Kasten2012-09-091-1/+40
|\ \ \ \ \
| * | | | | Add outlier statistics for fast mixer cycle timesGlenn Kasten2012-09-071-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I31c964caeb8b5d9ae0a426224f030cdcb01114a0
* | | | | | Fix buffer size issue for multichannel HE-AACJean-Michel Trivi2012-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decoding of HE-AAC fails due to output buffer size being too small. Size output buffer size according to maximum number of channels. Change-Id: I6b10842cf7ba3da1f4b4075b1f7f5404bf76be41
* | | | | | Revert max buffers change.Jeff Brown2012-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use 31 buffers crashes on Prime. Bug: 7131413 Change-Id: Ib85aef9b1da01f7243bd781a0efa47de2970412d
* | | | | | Add a permission for controlling wifi display.Jeff Brown2012-09-071-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I321b6c1a0223e0c3d5df04fde7a13ab91c08c7bc
* | | | | | Merge "Fix headroom management in equalizer" into jb-mr1-devEric Laurent2012-09-071-3/+8
|\ \ \ \ \ \
| * | | | | | Fix headroom management in equalizerEric Laurent2012-09-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a bug resetting the headroom parameters when calling the bundle process function for the first time. Change-Id: Ie05f97606f415954340ff2a4e48cd7b0a97a063b
* | | | | | | Fix buildJames Painter2012-09-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia4bebc4ecc850b42ebd4edd1ffed07e9bc2ec300
* | | | | | | Camera2: Add a burst mode skeleton.James Painter2012-09-0712-9/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6243944 Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
* | | | | | | Merge "Less verbose logging, lots of references." into jb-mr1-devAndreas Huber2012-09-073-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Less verbose logging, lots of references.Andreas Huber2012-09-073-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcb76848883b113e956d7e6266da882771a053b8
* | | | | | | | Merge "Make wfd code work with both old and new dongles." into jb-mr1-devAndreas Huber2012-09-072-24/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Make wfd code work with both old and new dongles.Andreas Huber2012-09-072-24/+26
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: Idc750dc334c47a171791587dd7e7281d565ff566
* | | | | | | Merge "audioflinger: changes for new audio devices enums" into jb-mr1-devEric Laurent2012-09-073-69/+57
|\ \ \ \ \ \ \
| * | | | | | | audioflinger: changes for new audio devices enumsEric Laurent2012-09-073-69/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ThreadBase class now has a separate member for input and output devices (mInDevice, mOutDevice). Only query get_supported_devices() from audio HAL if the function is exposed and if the audio policy manager did not specify the audio module to open. Also fixed bug in AEC preprocessing that would reset to default output device when an input device was given. Change-Id: I19d4d06aeb920b068e3ef31e6e6be6345ce5d67a
* | | | | | | | Merge "Fix iTunSMPB parsing for AAC tracks encoded with Nero" into jb-mr1-devJohn Grossman2012-09-071-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix iTunSMPB parsing for AAC tracks encoded with NeroJohn Grossman2012-09-071-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to clear out the mean/name/data state when parsing apple-style metadata from tracks every time we have a full set, not just when we find an iTunSMPB set. AAC tracks encoded from WAV by Nero tend to put in an additional apple style metadata tag (cdec) before the iTunSMPB tag. The sequence in the file goes something like mean : "com.apple.iTunes" name : "cdec" data : "ndaudio 1.5.4.0 / -2pass -br 320000" mean : "com.apple.iTunes" name : "iTunSMPB" data : " 00000000 00000A40 000000B8 <etc...>" If the internal state was not cleared after the first set, then when the second instance of "name" is encountered, an attempt is made to parse the previous data entry as an iTunSMPB tag when it is actually a cdec tag. Afterwards, mean, name and data are all cleared, and when the second data is encountered there is no current mean or name present, so the gapless metadata gets skipped. By clearing the metadata state every time we have a full set of mean/name/data, we make sure that we are always interpreting the data field as the proper type. Change-Id: I196e2e3f83e434f15d5ee55ae40a74a92d5a1845
* | | | | | | | | Merge "Camera2: Increase zoom steps." into jb-mr1-devAlexander Ray2012-09-071-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Camera2: Increase zoom steps.Eino-Ville Talvala2012-09-061-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10 is too low for smooth zoom; increase number to improve smoothness. Bug: 7120794 Change-Id: I178cd3890ef37beeff97cadb9e92ceab6d2cad06
* | | | | | | | Camera2: Use the recordingHint parameter.Eino-Ville Talvala2012-09-072-22/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use recordingHint to create recording and still capture streams up front, and to use the recording template when doing preview. Bug: 6243944 Change-Id: Ifeb624794849f734784b53a1a10ff2bfe8f1a357
* | | | | | | | Camera2: Delete all streams and stop all threads during shutdown.Eino-Ville Talvala2012-09-074-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6243944 Change-Id: If13a1f91e8a07c1ec4f91183d1a4b261ec4f6d52
* | | | | | | | Merge "Camera2: Play shutter and recording sounds." into jb-mr1-devEino-Ville Talvala2012-09-073-0/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |