summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Converter now takes the desired _output_ format instead of theAndreas Huber2013-06-123-37/+30
| | | | | | input format, allowing control over the type of encoding. Change-Id: Iaaa1a825f447ea130e373bbd8e5dc96f2762db18
* am f8af99b7: am 0662f7b6: Merge "stagefright: synchronously change ↵Lajos Molnar2013-06-122-14/+19
|\ | | | | | | | | | | | | nativewindow crop" into jb-mr2-dev * commit 'f8af99b7c10f1441d9a52676724b168f20752270': stagefright: synchronously change nativewindow crop
| * am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" ↵Lajos Molnar2013-06-122-14/+19
| |\ | | | | | | | | | | | | | | | | | | into jb-mr2-dev * commit '0662f7b6735df0a140f6512285d05f8f9a38bb98': stagefright: synchronously change nativewindow crop
| | * Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-devLajos Molnar2013-06-122-14/+19
| | |\
| | | * stagefright: synchronously change nativewindow cropLajos Molnar2013-06-112-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only change the nativewindow crop before queuing frames with the new crop. Change-Id: Icd8a84c82e66a8be3d6bc1675c777b1de8dc39b9 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 9395753
* | | | am bb35be24: am 7be48189: Merge "audioflinger: fix effects on direct output ↵Eric Laurent2013-06-121-7/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | threads" into jb-mr2-dev * commit 'bb35be24239f05f59715960a93cd491a4cd3b4d6': audioflinger: fix effects on direct output threads
| * | | am 7be48189: Merge "audioflinger: fix effects on direct output threads" into ↵Eric Laurent2013-06-121-7/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '7be48189c0aefb82825a7689d9e1005175570779': audioflinger: fix effects on direct output threads
| | * | Merge "audioflinger: fix effects on direct output threads" into jb-mr2-devEric Laurent2013-06-121-7/+5
| | |\ \ | | | |/ | | |/|
| | | * audioflinger: fix effects on direct output threadsEric Laurent2013-06-111-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PlaybackThread::addTrack_l() uses the assumption that effects are attached to a track only if the track accumulation buffer is different from the mixer thread output buffer. This is not true for direct output threads where only one track is active an only one buffer is needed. This assumption is an optimization to avoid checking for effect chains with the same session ID each time a track is processed. The optimization is not key if only one track is attached to the thread which is the case for direct outputs. Current code fails to increment the active track count in the effect chain on direct output threads when a track is started thus making the effect framework clear the mix buffer and produce silence each time the mixer runs. The fix consists in removing the optimization described above. Bug: 9324989. Change-Id: Id7a6337450ed90d326299c2ce9fc02f4b9e2fa6f
* | | | am 765f99f3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '765f99f30fdc18396ce4edc9facbe6632c9b858e':
| * | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-120-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362
| | * \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-120-0/+0
| | |\ \ \ | | | |/ / | | |/| |
* | | | | am 44ade05f: am ea26c777: Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '44ade05f8d030ae3af8d05359734b18eac433935': Camera3: Skip no-op stream configurations.
| * | | | am ea26c777: Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ea26c7772f4721657db409068d4bed194ae49c94': Camera3: Skip no-op stream configurations.
| | * | | Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If configuring the same set of streams more than once, don't actually call into the HAL for the second and subsequent configure calls, since they're no-ops. This can speed up camera operation substantially if the HAL implementation does not detect no-ops on its own and does a full shutdown/restart on each configure call. Bug: 9392513 Change-Id: I23baf4acbae2304735899adcf8e17565fa94d31d
* | | | Merge "camera: Make some binder interfaces compatible with AIDL"Igor Murashkin2013-06-1110-6/+106
|\ \ \ \
| * | | | camera: Make some binder interfaces compatible with AIDLIgor Murashkin2013-06-1110-6/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done: * ICameraService * ICameraServiceListener Partial: * ICamera (disconnect only) * IProCameraUser (disconnect only) Bug: 9213377 Change-Id: I8e2e6e05cfd02ec36be1d5b2c551f10ffb43b5b4
* | | | | Merge "Camera3: Add more tracing"Eino-Ville Talvala2013-06-102-3/+23
|\ \ \ \ \
| * | | | | Camera3: Add more tracingEino-Ville Talvala2013-06-072-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5f5d0d3f37244f19446c473db70373bdf16cce56
* | | | | | am 6c72c187: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release ↵The Android Open Source Project2013-06-100-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '6c72c1877fadca5068fa94f7a0249c0609e85534': camera2/3: Fix deadlock take picture while preview callback camera3: Fix crash in set error state. camera2/3: Add protection to callback processing call
| | | | | |
| | \ \ \ \
| *-. \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-100-0/+0
| |\ \ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | Change-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8
| | | * | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-090-0/+0
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | camera2/3: Fix deadlock take picture while preview callbackZhijun He2013-06-071-87/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acquiring mInputMutex before SharedParameters mutex in preview callback thread causes circular locking dependency between callback thread and capture callback thread. Enforce the right lock ordering to break the dead lock. Bug: 9323319 Change-Id: Iea2e025e4d9e29debcf74297c19930075017e179
| | * | | | | camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When camera open fails in camera3device initialize call, setErrorStateLockedV() tries to access RequestThread object that is not created yet. Bug: 9319518 Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
| | * | | | | camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callback stream in callbackprocessor could be delleted while process or discard callback are ongoing, which leads CpuConsumer related call crash. Bug 9303911 Change-Id: Ib6137e512208e5603468eba166640729b744e8f9
* | | | | | | am 574ca4f4: am ba696bbf: Merge "camera2/3: Fix deadlock take picture while ↵Zhijun He2013-06-071-87/+88
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preview callback" into jb-mr2-dev * commit '574ca4f4f15a42d6159150149f68bf3cb800d869': camera2/3: Fix deadlock take picture while preview callback
| * | | | | | am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview ↵Zhijun He2013-06-071-87/+88
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callback" into jb-mr2-dev * commit 'ba696bbff88d5627beaa0be95be78ba30138983d': camera2/3: Fix deadlock take picture while preview callback
| | * | | | | Merge "camera2/3: Fix deadlock take picture while preview callback" into ↵Zhijun He2013-06-071-87/+88
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | | | | camera2/3: Fix deadlock take picture while preview callbackZhijun He2013-06-061-87/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acquiring mInputMutex before SharedParameters mutex in preview callback thread causes circular locking dependency between callback thread and capture callback thread. Enforce the right lock ordering to break the dead lock. Bug: 9323319 Change-Id: Iea2e025e4d9e29debcf74297c19930075017e179
* | | | | | | | am d3a5b48a: am 18b46679: Merge "AudioFlinger: do not cache audio device ↵Eric Laurent2013-06-072-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when 0." into jb-mr2-dev * commit 'd3a5b48a1bc4f5d6ff4472f54f909abaadd5fa39': AudioFlinger: do not cache audio device when 0.
| * | | | | | | am 18b46679: Merge "AudioFlinger: do not cache audio device when 0." into ↵Eric Laurent2013-06-072-4/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '18b466790aa0a55ff4282ed8b5e550e58e0444b2': AudioFlinger: do not cache audio device when 0.
| | * | | | | | Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-devEric Laurent2013-06-072-4/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | AudioFlinger: do not cache audio device when 0.Eric Laurent2013-06-062-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger should not cache the audio device passed to the audio HAL when it is AUDIO_DEVICE_NONE but keep previous valid selection instead. Bug: 9323399. Change-Id: I6f9480e55a21be4115453e6a5eebc5cf2536c476
* | | | | | | | am 1c540f7d: am 911a184b: am 132bc5bd: Merge "Noise will be heard if audio ↵Glenn Kasten2013-06-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample rate not matched with audio track" * commit '1c540f7d1b04cfd74847587f127b7539c3c15864': Noise will be heard if audio sample rate not matched with audio track
| * | | | | | | am 911a184b: am 132bc5bd: Merge "Noise will be heard if audio sample rate ↵Glenn Kasten2013-06-070-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not matched with audio track" * commit '911a184bb5f5177a00bb4a8c80453f22e67b449c': Noise will be heard if audio sample rate not matched with audio track
| | * \ \ \ \ \ \ am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched ↵Glenn Kasten2013-06-070-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with audio track" * commit '132bc5bd1c68aa807a20e1655f009f74433be588': Noise will be heard if audio sample rate not matched with audio track
| | | * \ \ \ \ \ \ Merge "Noise will be heard if audio sample rate not matched with audio track"Glenn Kasten2013-06-071-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Noise will be heard if audio sample rate not matched with audio trackMing Zhou2013-06-071-1/+1
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When audio sample rate which set to audio track is not the same with the actual pcm data, noise will be heard. Fix the bug when write 8 bit pcm samples. Change-Id: Idcb0d7b0e9aaa250dd22b758c8337e23d1706049 Signed-off-by: Ming Zhou <b42586@freescale.com> Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
* | | | | | | | | | Remove "LOCAL_MODULE_TAGS := debug" for stagefright testsMike Lockwood2013-06-062-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53815d2f6d7dfe7eebb26c3802eb3d195244aab1
* | | | | | | | | | am e097efde: am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e097efde4363f80d5ffc34da6ec6253fbd4e5397': camera3: Fix crash in set error state.
| * | | | | | | | | am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b05eeaedacaff92b6e5ac89f99b0fccdf7643f09': camera3: Fix crash in set error state.
| | * | | | | | | | camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When camera open fails in camera3device initialize call, setErrorStateLockedV() tries to access RequestThread object that is not created yet. Bug: 9319518 Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
* | | | | | | | | am 1d263b89: am 62a8f67f: camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1d263b89bd1c5d73389f53976e104dd6b088ab6e': camera2/3: Add protection to callback processing call
| * | | | | | | | am 62a8f67f: camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '62a8f67f33faf19d0ff815672dd19bb71dd0d650': camera2/3: Add protection to callback processing call
| | * | | | | | | camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callback stream in callbackprocessor could be delleted while process or discard callback are ongoing, which leads CpuConsumer related call crash. Bug 9303911 Change-Id: Ib6137e512208e5603468eba166640729b744e8f9
* | | | | | | | | am 25c8c528: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release ↵The Android Open Source Project2013-06-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '25c8c528101360119f2aafc1871811cc1a5ad519': Camera2/3: Move recording frame processing to its own thread. stagefright: Fix port-reconfiguration & output-buffer-filled race condition Camera2/3: Don't trigger AF when in INFINITY focus mode.
| | | | | | | | |
| | \ \ \ \ \ \ \
| *-. \ \ \ \ \ \ \ Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-06-060-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | / / / | | | | |_|_|/ / / | | | |/| | | | | Change-Id: I0aa9bb7e725a8352da3eae512c2a62df4f12e3b3
| | | * | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-060-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-06-050-0/+0
| | | | |\ \ \ \ \
| | * | | | | | | | Camera2/3: Move recording frame processing to its own thread.Eino-Ville Talvala2013-06-053-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to new deadlock opportunities from HAL3 integration, recording frame processing needs to move out of the new frame handler into its own thread in StreamingProcessor. Bug: 9282913 Change-Id: I8d2926f2de9d0d395eef3c328c65caebbdbd2827
generated by cgit v1.1 at 2024-06-30 09:38:12 +0000