summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audioflinger: fix offload resume after drainEric Laurent2013-11-121-5/+9
| | | | | | | | | | | When pausing and resuming during the drain, the drain sequence number shuold not be modified otherwise the drain callback will be ignored. This causes failure to notify end of stream to audio player and transition to next song. Bug: 11247103. Change-Id: I2a35c5cc3fd6aa667cdd257f9e9cc8715cef5159
* Merge "Back to the old way of making sure that no more buffers are ↵Andreas Huber2013-11-121-2/+4
|\ | | | | | | submitted" into klp-dev
| * Back to the old way of making sure that no more buffers are submittedAndreas Huber2013-11-081-2/+4
| | | | | | | | | | | | | | to the component while in executing->idle state. Change-Id: Ia207f0a112025ed0e2c4d62f404afbbfa694cbab related-to-bug: 11557463, 11573543
* | Camera API2: Add support for partial result quirkEino-Ville Talvala2013-11-125-14/+29
| | | | | | | | | | | | | | | | | | - Camera3Device: Include requestId in partial 3A results - FrameProcessorBase: Add support for partial result listeners - CameraDeviceClient: Listen and forward partial results to client Bug: 11115603 Change-Id: If1cc6bbc32932742ac142c058688761ebf6a8024
* | Merge "configure bitrate and bitrate mode at encoder initialization for ↵Andreas Huber2013-11-122-0/+17
|\ \ | | | | | | | | | VP8/9" into klp-dev
| * | configure bitrate and bitrate mode at encoder initialization for VP8/9Andreas Huber2013-11-052-0/+17
| | | | | | | | | | | | | | | Change-Id: I0389264db4102cabb0c6fcb4ca223d85cc9e86fb related-to-bug: 11536167
* | | Merge "StageFrightRecorder: do not use meta-data mode for software encoders" ↵Lajos Molnar2013-11-114-13/+39
|\ \ \ | | | | | | | | | | | | into klp-dev
| * | | StageFrightRecorder: do not use meta-data mode for software encodersLajos Molnar2013-10-304-13/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera HAL v1 uses vendor-specific camera-source meta-data mode, but software encoders use generic gralloc-source mode, so they are not compatible. Change-Id: I0d1bab8eada26dcb70c97b1eec83f06d1f331239 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11446505
* | | | Merge "TimedEventQueue: improve wakelock management" into klp-devEric Laurent2013-11-112-43/+55
|\ \ \ \ | |_|_|/ |/| | |
| * | | TimedEventQueue: improve wakelock managementEric Laurent2013-11-072-43/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not acquire a wakelock unless the event is delayed by more than a given time. This prevents from acquiring/releasing wakelocks too often which has adverse effects on performance. Bug: 11509471. Change-Id: Id06803b393b40c4db5095a6e7ec02339fa581a38
* | | | Merge "Properly handle executing->idle in GraphicBufferSource" into klp-devAndreas Huber2013-11-083-7/+29
|\ \ \ \
| * | | | Properly handle executing->idle in GraphicBufferSourceAndreas Huber2013-11-073-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec has initiated the transition from exectuing->idle and is waiting for the component to return all buffers so they can be freed. It's counter productive and with some vendors harmful to submit additional buffers to the component from this point on. Change-Id: I332be254a1faf94902c77b5792a373ab447e44d3 related-to-bug: 11573543
* | | | | Replace assert with error messageAndy McFadden2013-11-071-1/+6
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The failure happens when vendor code sends EMPTY_BUFFER_DONE twice on the same buffer. The second time through, we see a slot that has already been emptied, and get very confused. This should be handled with an error, not an assertion, so we now log a stern complaint and carry on. Bug 11557463 Change-Id: I76e53ff08924bca81afb6980df8e59a6012ff8fe
* | | | Camera HAL3/API1: Add support for the partial result quirk.Eino-Ville Talvala2013-11-0610-87/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Camera2Client: - Detect partial result quirk - Camera3Device: - Accumulate all partial results together - Fire off 3A-only result once all 3A states are available - FrameProcessorBase: - Filter out partials, don't send to listeners - FrameProcessor: - Skip face detect on partials - Make sure to only handle a 3A update for a given frame once - Trigger AF notifications when AF mode or trigger changes, to properly detect all AF transitions. Bug: 11115603 Change-Id: Iea8aa73c568701562a46071f7ea100624251d10b
* | | | Merge "audioflinger: fix direct output underrun" into klp-devEric Laurent2013-11-061-0/+6
|\ \ \ \ | |/ / / |/| | |
| * | | audioflinger: fix direct output underrunEric Laurent2013-11-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Underruns on tracks handled by a direct or offloaded threads were not properly reported to the applications causing a failure to automatically recover. Bug: 11535001. Change-Id: I7a8696b4d646f78b16710addfe7c108d0dd0038d
* | | | Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
|\ \ \ \
| * | | | Notify current video size if availableMarco Nelissen2013-11-011-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/11248101 Change-Id: I0fa3b5592efcf400c86692002267da6825e331ad
* | | | | Merge "Restore NuPlayer error and EOS handling" into klp-devLajos Molnar2013-11-012-4/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Restore NuPlayer error and EOS handlingLajos Molnar2013-10-302-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was erroneously removed by commit a73c954 Change-Id: I4742339139e770f0181c99d427875897fd60b68e Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11413439
* | | | | Merge "AudioFlinger: fix duplicating thread standby." into klp-devEric Laurent2013-10-311-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | AudioFlinger: fix duplicating thread standby.Eric Laurent2013-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fd47797 fixing issue 11247103 introduced a regression where the duplicating thread does not exit standby state as expected. This in turn prevents the tracks sending audio to other threads to complete their activity cycle normally. The fix conists in clearing mStandby state also in the specialized threadLoop_write() method of DuplicatingThread subclass. Bug: 11451415. Change-Id: Ie8a92c819a56a2834ea25fa70a8b7b2125721775
* | | | | Merge "camera: Collect stack traces when bad things happen, print with ↵Igor Murashkin2013-10-305-0/+171
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | dumpsys" into klp-dev
| * | | | camera: Collect stack traces when bad things happen, print with dumpsysIgor Murashkin2013-10-295-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11324229 Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
* | | | | Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-devLajos Molnar2013-10-301-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | AwesomePlayer: ensure STARTED message works after resetLajos Molnar2013-10-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11412881
* | | | | Merge "audioflinger: enable effects after registration if needed" into klp-devEric Laurent2013-10-302-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | audioflinger: enable effects after registration if neededEric Laurent2013-10-122-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where effects were not properly reenabled after being moved from one playback thread to another. The effect is enabled but the audio policy manager sees it as disabled. Bug: 11181933. Change-Id: I19cac7acbaf61c546e667fd85ed7d4eda1c716d8
* | | | | AudioFlinger: more fixes for offload audio lostEric Laurent2013-10-282-14/+26
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mStandby being false was not a reliable indication that something had been written to audio HAL. Considering the last track in mActiveTracks vector as the latest activated track was wrong as this is a SortedVector. Bug: 11247103. Change-Id: I397d011c5afcdd779def3fe25aaae7669a472cfc
* | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-2514-52/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Cherrypicked from master. b/9464621 Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | | | Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
|\ \ \ \ | |_|/ / |/| | |
| * | | Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Repeating the most-recent buffer appears to fail when the producer disconnects. This adds a NULL check to avoid crashing. Bug 10607920 Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
* | | Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
|\ \ \ | |/ / |/| |
| * | Fix kAutoRampDurationUs overflow issueVineeta Srivastava2013-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When kAutoRampDurationUs multiplies with mSampleRate, it overflows to int64. Type cast it to int64 to make sure RampDurationUs properly. BUg: 11162491 Change-Id: I4f93bc9acc8456e25623a9255ca7a5b206425009
* | | Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-183-6/+11
|\ \ \
| * | | Allow releaseBuffer after flushGlenn Kasten2013-10-183-6/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After AudioTrack start checks for pending flush, allow releaseBuffer on any previously obtained buffer. For example, this can happen if the resampler has obtained a buffer but not released the whole buffer yet. Note that the resampler will be reading obsolete data. Bug: 11285590 Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
* | | audioflinger: fix track terminated before playingEric Laurent2013-10-172-13/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | When a track is terminated before any audio was written, we should not send a drain request to the HAL. The drain will be ignored and we will wait the async callback for ever. Also fix a potential deadlock by not deleting a track with the thread mutex held: mPreviousTrack changed from a sp to a raw pointer. Bug: 11247103. Change-Id: I0a4b47b099204c7c326d45d700234ab8f72d8eae
* | Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
|\ \
| * | Fix flush() followed by start()Glenn Kasten2013-10-171-0/+9
| | | | | | | | | | | | | | | Bug: 11259166 Change-Id: I72526cdfd4e3ff4b06e6a317e577f57cc285205d
* | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
|/ / | | | | | | | | | | | | by posting buffering events while in the CACHE_UNDERRUN state. Change-Id: Ic60c8d57f0ae502aa2b6eec7160dc4224b989604 related-to-bug: 11262689
* | Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-172-7/+9
|\ \
| * | Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-162-7/+9
| | | | | | | | | | | | | | | Bug: 11148722 Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
* | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \
| * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | |\ \
| | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
| | | |\ \ | | | | |/ | | | |/|
| | | | * Camera: Skip AE precapture when possibleZhijun He2013-10-111-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip AE precapture when AE is already converged for still capture use case. This could save still capture latency 6-7 frame time for AE already converged case. Bug: 10712902 Change-Id: Ie5512618b76e5d87c62c57c3d96d2004c604e29e
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-090-0/+0
| | | | | |\
| | | | | | * Cleanup openRecord error handlingGlenn Kasten2013-10-075-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10888816 Change-Id: I84897dd7d30b370640b54e928f230604b873cb68