OSDN Git Service

android-x86/frameworks-av.git
11 years agoCamera2/3: Create JPEG stream unconditionally.
Eino-Ville Talvala [Mon, 10 Jun 2013 22:12:01 +0000 (15:12 -0700)]
Camera2/3: Create JPEG stream unconditionally.

Instead of creating the JPEG output stream only at first use,
create it at time of preview start. This is important for reducing
the first-capture latency on HAL3 devices, and for ZSL on them.

Bug: 9339858
Change-Id: I4296f706cfd151c47ef315149e87d01fe554aaa4

11 years agoMerge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
Zhijun He [Fri, 7 Jun 2013 16:58:12 +0000 (16:58 +0000)]
Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev

11 years agoMerge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
Eric Laurent [Fri, 7 Jun 2013 15:52:59 +0000 (15:52 +0000)]
Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev

11 years agoAudioFlinger: do not cache audio device when 0.
Eric Laurent [Fri, 7 Jun 2013 01:29:01 +0000 (18:29 -0700)]
AudioFlinger: do not cache audio device when 0.

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

11 years agocamera2/3: Fix deadlock take picture while preview callback
Zhijun He [Thu, 6 Jun 2013 23:52:02 +0000 (16:52 -0700)]
camera2/3: Fix deadlock take picture while preview callback

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

11 years agocamera3: Fix crash in set error state.
Zhijun He [Thu, 6 Jun 2013 20:51:22 +0000 (13:51 -0700)]
camera3: Fix crash in set error state.

When camera open fails in camera3device initialize call, setErrorStateLockedV()
tries to access RequestThread object that is not created yet.

Bug: 9319518
Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727

11 years agocamera2/3: Add protection to callback processing call
Zhijun He [Thu, 6 Jun 2013 03:00:09 +0000 (20:00 -0700)]
camera2/3: Add protection to callback processing call

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

11 years agoCamera2/3: Move recording frame processing to its own thread.
Eino-Ville Talvala [Tue, 4 Jun 2013 23:34:35 +0000 (16:34 -0700)]
Camera2/3: Move recording frame processing to its own thread.

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

11 years agoMerge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-dev
Eino-Ville Talvala [Tue, 4 Jun 2013 16:17:17 +0000 (16:17 +0000)]
Merge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-dev

11 years agoCamera2/3: Don't trigger AF when in INFINITY focus mode.
Eino-Ville Talvala [Mon, 3 Jun 2013 23:50:53 +0000 (16:50 -0700)]
Camera2/3: Don't trigger AF when in INFINITY focus mode.

While the HAL should ignore it, it's faster to immediately respond
with success.

Also filter out cancel autofocus calls for FIXED/INFINITY focus.

Bug: 9263856
Change-Id: I637ec7c8b459d654ef11cb1142b959f2674224c5

11 years agoMerge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition...
Lajos Molnar [Mon, 3 Jun 2013 20:30:48 +0000 (20:30 +0000)]
Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev

11 years agoUpdate HTTP proxy configuration for all media playback inside stagefright.
Andreas Huber [Wed, 29 May 2013 21:20:52 +0000 (14:20 -0700)]
Update HTTP proxy configuration for all media playback inside stagefright.

Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug: 8873723
(cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)

11 years agostagefright: Fix port-reconfiguration & output-buffer-filled race condition
Lajos Molnar [Fri, 26 Apr 2013 23:11:45 +0000 (16:11 -0700)]
stagefright: Fix port-reconfiguration & output-buffer-filled race condition

Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).

Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.

Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 8736466

11 years agoMerge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
Lajos Molnar [Wed, 29 May 2013 19:11:25 +0000 (19:11 +0000)]
Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev

11 years agoMerge "camera3: Don't try to disconnect stream native windows more than once" into...
Igor Murashkin [Tue, 28 May 2013 23:47:00 +0000 (23:47 +0000)]
Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev

11 years agoMediaMuxer: Remove SAMPLE_FLAG_SYNC flag
Lajos Molnar [Tue, 28 May 2013 17:11:35 +0000 (10:11 -0700)]
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag

MediaMuxer.writeSampleData() uses MediaCodec.BufferInfo
objects to specify the flags, so use directly the MediaCodec
flags.  This is more intuitive and avoids users of the
MediaMuxer API having to create translations between
MediaMuxer's and MediaCodec's flag constants.

Change-Id: I18e12a6839ffb2c63da62516a4dc4c94e8bb3d17
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479

11 years agocamera3: Don't try to disconnect stream native windows more than once
Igor Murashkin [Tue, 28 May 2013 22:31:39 +0000 (15:31 -0700)]
camera3: Don't try to disconnect stream native windows more than once

This fixes the multiple-disconnect-from-BufferQueue bug.

(In logs)
BufferQueue: [SurfaceView] disconnect: connected to another api (cur=0, req=4)

Bug: 9114681
Change-Id: I21ae1c5bd993701eea13648aa9994979a24eb210

11 years agoMerge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
Zhijun He [Fri, 24 May 2013 15:32:48 +0000 (15:32 +0000)]
Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev

11 years agoMerge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
Ed Heyl [Fri, 24 May 2013 05:15:23 +0000 (05:15 +0000)]
Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev

11 years agocamera3: Disable ZSL for limited mode camera HALs
Igor Murashkin [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs

Bug: 9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90

11 years agoMerge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
Igor Murashkin [Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)]
Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev

11 years agoCamera3: Fix the deadlock during recording pinch zooming
Zhijun He [Wed, 22 May 2013 21:01:30 +0000 (14:01 -0700)]
Camera3: Fix the deadlock during recording pinch zooming

When zooming during recording, hal callback thread and request update thread run
into deadlock due to lock circular dependency. This change release lock during
queuebuffer in callback thread to break the dependency.

Bug: 9091576
Change-Id: Ia7b3f0ec17573cb32a5696dcde419ca28f42cfb8

11 years agoMerge "Camera3: Make sure new metadata results signal other threads waiting" into...
Igor Murashkin [Thu, 23 May 2013 17:57:16 +0000 (17:57 +0000)]
Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev

11 years agocamera3: Fix zsl buffers released-while-in-use race condition
Igor Murashkin [Wed, 22 May 2013 22:54:57 +0000 (15:54 -0700)]
camera3: Fix zsl buffers released-while-in-use race condition

Bug: 9007356
Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf

11 years agoMerge "camera3: Fix recording failure when switching resolutions while preview on...
Igor Murashkin [Wed, 22 May 2013 19:54:28 +0000 (19:54 +0000)]
Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev

11 years agoCamera3: Fix Bug minTimestamp is never greater than frame timestamp
Mansoor Aftab [Wed, 22 May 2013 01:58:53 +0000 (18:58 -0700)]
Camera3: Fix Bug minTimestamp is never greater than frame timestamp

Bug in logic since minTimestamp is initialized to -1, and this needs
to be updated for the first frame atleast for logic to work correctly
for subsequent frames.

Bug: 9007356
Change-Id: I70edc4d9f34ff67a141c027c67396dc2ca9e413a
Signed-off-by: Igor Murashkin <iam@google.com>
11 years agocamera3: Fix recording failure when switching resolutions while preview on
Igor Murashkin [Tue, 21 May 2013 18:38:49 +0000 (11:38 -0700)]
camera3: Fix recording failure when switching resolutions while preview on

Bug: 9069574
Change-Id: Ife2ae5467f799dbe37e66714b3a6c9a51e1fe328

11 years agoCamera3: Make sure new metadata results signal other threads waiting
Igor Murashkin [Fri, 17 May 2013 21:39:53 +0000 (14:39 -0700)]
Camera3: Make sure new metadata results signal other threads waiting

- Also adds a lot of logging around shuffling around metadata frames

Bug: 9007356
Change-Id: I4285f4f55b4b899ea4928d43062c705619c8248a

11 years agoMerge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev
Jamie Gennis [Tue, 21 May 2013 18:37:54 +0000 (18:37 +0000)]
Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev

11 years agoAvoid a deadlock during EmptyBufferDone
Andreas Huber [Mon, 20 May 2013 16:13:23 +0000 (09:13 -0700)]
Avoid a deadlock during EmptyBufferDone

The deadlock happens withen in the case where we use an OMX encoder with a
GraphicBufferSource.

Bug: 8329090
Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45

11 years agoCamera2/3: Increase digital zoom steps
Zhijun He [Mon, 20 May 2013 18:18:39 +0000 (11:18 -0700)]
Camera2/3: Increase digital zoom steps

Digitial zoom number of steps was 30 and a bit rough. Change it to 100 to make
smooth zoom smoother.

Bug: 9050908
Change-Id: I141bc0335d58cdcd6530c14cbbfe6c4ffb4c6dc6

11 years agoMerge "update to Fence::waitForever() API change" into jb-mr2-dev
Mathias Agopian [Fri, 17 May 2013 17:15:07 +0000 (17:15 +0000)]
Merge "update to Fence::waitForever() API change" into jb-mr2-dev

11 years agoMerge "Adjust timestamp scale" into jb-mr2-dev
Andy McFadden [Fri, 17 May 2013 16:48:14 +0000 (16:48 +0000)]
Merge "Adjust timestamp scale" into jb-mr2-dev

11 years agoupdate to Fence::waitForever() API change
Mathias Agopian [Fri, 17 May 2013 01:07:35 +0000 (18:07 -0700)]
update to Fence::waitForever() API change

Bug: 8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695

11 years agoAdjust timestamp scale
Andy McFadden [Wed, 15 May 2013 23:48:19 +0000 (16:48 -0700)]
Adjust timestamp scale

BufferQueue item timestamps are in nanoseconds, MediaCodec buffer
timestamps are in microseconds.  Adjust.

Bug 8988357

Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b

11 years agowifi-display: retry UDP read/write to improve connection robustness
Chong Zhang [Thu, 16 May 2013 01:47:26 +0000 (18:47 -0700)]
wifi-display: retry UDP read/write to improve connection robustness

Bug: 8922753
Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8

11 years agoMerge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev
Conley Owens [Wed, 15 May 2013 22:00:10 +0000 (15:00 -0700)]
Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev

-s ours, so that jb-mr1-dev-plus-aosp can continue fastforwarding to
jb-mr2-dev.

11 years agoMerge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
Eino-Ville Talvala [Wed, 15 May 2013 15:58:27 +0000 (15:58 +0000)]
Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev

11 years agoMerge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
Chong Zhang [Wed, 15 May 2013 02:13:15 +0000 (02:13 +0000)]
Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev

11 years agoCamera3: Fix fast flexible YUV->NV21 path.
Eino-Ville Talvala [Tue, 14 May 2013 23:05:27 +0000 (16:05 -0700)]
Camera3: Fix fast flexible YUV->NV21 path.

A U by any other name may smell just as sweet, but the color's pretty
awful if you call it a V.

Henceforth they never will be UV.

Bug: 8949720
Change-Id: I4897e93d5a293e576bb1d7ba44d91792b869ad42

11 years agoCamera: don't spam RingBufferConsumer logs in eng builds
Igor Murashkin [Tue, 14 May 2013 23:17:12 +0000 (16:17 -0700)]
Camera: don't spam RingBufferConsumer logs in eng builds

Bug: 8969579
Change-Id: Ia51d4072725754fd3b6ca028232a605885376287

11 years agoam 72c324ef: Empty test commit for AOSP
Conley Owens [Tue, 14 May 2013 18:03:59 +0000 (11:03 -0700)]
am 72c324ef: Empty test commit for AOSP

* commit '72c324efd5a0f632d8f2b57b9f587a540d809b82':
  Empty test commit for AOSP

11 years agoMerge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev
Igor Murashkin [Tue, 14 May 2013 18:02:26 +0000 (18:02 +0000)]
Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev

11 years agoEmpty test commit for AOSP
Conley Owens [Tue, 14 May 2013 17:14:40 +0000 (10:14 -0700)]
Empty test commit for AOSP

11 years agoMerge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev
Eric Laurent [Tue, 14 May 2013 15:44:43 +0000 (15:44 +0000)]
Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev

11 years agoCamera: Pause preview when needing to delete jpeg/zsl streams
Igor Murashkin [Mon, 13 May 2013 21:53:44 +0000 (14:53 -0700)]
Camera: Pause preview when needing to delete jpeg/zsl streams

Bug: 8876221
Change-Id: Idf9490a48462fa44d49c4ebe99425c3149ae6378

11 years agoMerge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev
Igor Murashkin [Mon, 13 May 2013 20:47:17 +0000 (20:47 +0000)]
Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev

11 years agoFix unreleased mutex in ToneGenerator stopTone()
Eric Laurent [Mon, 13 May 2013 19:47:53 +0000 (12:47 -0700)]
Fix unreleased mutex in ToneGenerator stopTone()

Commit 09108ade introduced a regression by not releasing
the ToneGenerator mutex before exiting in case of error.

Bug: 8852855
Change-Id: I8ba2755b218842e2034ed8dbd54b18bf2a5fc571

11 years agowifi-display: misc fixes for M3 response parsing
Chong Zhang [Thu, 9 May 2013 08:27:59 +0000 (01:27 -0700)]
wifi-display: misc fixes for M3 response parsing

- fix wfd_video_format parsing w/ multiple H264-Codec
- fix handling of CRLF at end of M3 response
- fix missing wfd_client_rtp_ports

Bug: 8871667
Bug: 8875749

Change-Id: Idb0b5605313bba6ff067bcd765512bbed42e5202

11 years agoMerge "Don't purge effects we're about to start using" into jb-mr2-dev
Marco Nelissen [Sat, 11 May 2013 00:35:30 +0000 (00:35 +0000)]
Merge "Don't purge effects we're about to start using" into jb-mr2-dev

11 years agoMerge "Don't render buffers that have size 0" into jb-mr2-dev
Marco Nelissen [Sat, 11 May 2013 00:34:58 +0000 (00:34 +0000)]
Merge "Don't render buffers that have size 0" into jb-mr2-dev

11 years agoMerge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev
Eino-Ville Talvala [Fri, 10 May 2013 23:59:04 +0000 (23:59 +0000)]
Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev

11 years agoMerge "Camera2: FoV quirk crop regions" into jb-mr2-dev
Alex Ray [Fri, 10 May 2013 20:07:33 +0000 (20:07 +0000)]
Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev

11 years agoCamera3: Refactor stream code to be DRY
Igor Murashkin [Thu, 9 May 2013 01:03:15 +0000 (18:03 -0700)]
Camera3: Refactor stream code to be DRY

Bug: 8851039
Change-Id: Iaac2926bfa25dd6e9db8b307765d4fe709b88d21

11 years agoDon't purge effects we're about to start using
Marco Nelissen [Fri, 10 May 2013 17:10:42 +0000 (10:10 -0700)]
Don't purge effects we're about to start using

By acquiring the new session id before releasing the old, we prevent
purging existing effects with the new session id that aren't currently
attached but will be once the player is switched to the new session id.
b/8767565

Change-Id: I703881b69c5accd8832ac834246925a20ada4c21

11 years agoDon't render buffers that have size 0
Marco Nelissen [Thu, 9 May 2013 16:15:34 +0000 (09:15 -0700)]
Don't render buffers that have size 0

b/8857451

Change-Id: I12a31a2f85af76602db9e6f0ec80632954b3f7ed

11 years agoCamera3: Fix initial orientation configuration.
Eino-Ville Talvala [Fri, 10 May 2013 00:03:54 +0000 (17:03 -0700)]
Camera3: Fix initial orientation configuration.

One call to set orientation too many.

Bug: 8683719
Change-Id: I4b776fc8665eed940a1f18a6f617be4f1406e41a

11 years agoCamera2/3: Optimize a few YCbCr_420_888 copy paths
Eino-Ville Talvala [Thu, 9 May 2013 19:10:35 +0000 (12:10 -0700)]
Camera2/3: Optimize a few YCbCr_420_888 copy paths

Covers cases where the HAL format and the API format have the same
chroma layout.

Bug: 8734880
Change-Id: Ia735082c260b5914fc14f12551f91917c4e53b01

11 years agoMerge "camera3: Manage fences properly when buffers are returned with an error" into...
Igor Murashkin [Thu, 9 May 2013 19:01:31 +0000 (19:01 +0000)]
Merge "camera3: Manage fences properly when buffers are returned with an error" into jb-mr2-dev

11 years agoMerge "camera2: Add height to the crop region metadata property" into jb-mr2-dev
Igor Murashkin [Thu, 9 May 2013 19:01:18 +0000 (19:01 +0000)]
Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev

11 years agoMerge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev
Eino-Ville Talvala [Thu, 9 May 2013 17:13:44 +0000 (17:13 +0000)]
Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev

11 years agocamera3: Manage fences properly when buffers are returned with an error
Igor Murashkin [Tue, 7 May 2013 17:58:13 +0000 (10:58 -0700)]
camera3: Manage fences properly when buffers are returned with an error

Bug: 8622089
Change-Id: I4df0258d6803d460d4dd98f0a80829eb844ca30d

11 years agoMerge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect...
Igor Murashkin [Tue, 7 May 2013 23:42:30 +0000 (23:42 +0000)]
Merge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect" into jb-mr2-dev

11 years agoCamera2: FoV quirk crop regions
Alex Ray [Tue, 7 May 2013 21:31:02 +0000 (14:31 -0700)]
Camera2: FoV quirk crop regions

Bug: 8484377
Change-Id: I5ffcc20b68dc92b502acc9898e57f12cadb92848

11 years agocamera2: Add height to the crop region metadata property
Igor Murashkin [Tue, 7 May 2013 20:22:15 +0000 (13:22 -0700)]
camera2: Add height to the crop region metadata property

Bug: 8756080
Change-Id: I90b9166440e92f7675255a01ddc4a980c2e52201

11 years agoCamera3: Support flexible YUV for preview callbacks
Eino-Ville Talvala [Sun, 5 May 2013 01:24:30 +0000 (18:24 -0700)]
Camera3: Support flexible YUV for preview callbacks

When the HAL supports it, and the client asks for YV12 or NV21,
use the new flexible YUV format instead.

Bug: 8734880

Change-Id: Ib0129d9c26a6b30f3be7aa624c2439c6edba1bbd

11 years agoFix Audioflinger crash when TeeSink is enabled
Glenn Kasten [Mon, 6 May 2013 23:06:24 +0000 (16:06 -0700)]
Fix Audioflinger crash when TeeSink is enabled

Bug: 8834855
Change-Id: I54665f16d79901970348a8247d9a354da2990f42

11 years agoMerge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev
Igor Murashkin [Mon, 6 May 2013 03:20:18 +0000 (03:20 +0000)]
Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev

11 years agoMerge "camera3: Don't eagerly finish configuring bidi streams more than once" into...
Igor Murashkin [Mon, 6 May 2013 03:18:23 +0000 (03:18 +0000)]
Merge "camera3: Don't eagerly finish configuring bidi streams more than once" into jb-mr2-dev

11 years agoMerge "Remove timing jitter during startup of audio" into jb-mr2-dev
Eric Laurent [Fri, 3 May 2013 15:39:52 +0000 (15:39 +0000)]
Merge "Remove timing jitter during startup of audio" into jb-mr2-dev

11 years agoCamera: Hotplug - conditionally transition to PRESENT when clients disconnect
Igor Murashkin [Wed, 1 May 2013 22:42:20 +0000 (15:42 -0700)]
Camera: Hotplug - conditionally transition to PRESENT when clients disconnect

Fixes an issue where a client could unconditionally transition to PRESENT
after a client disconnects, even though the underlying HAL status was actually
NOT_PRESENT or ENUMERATING.

Bug: 8780114
Change-Id: I68adb5fc819eec3b046ddcb2507b84bedc999a0f

11 years agocamera: Use new camera_metadata structure validation functions
Igor Murashkin [Wed, 1 May 2013 01:18:06 +0000 (18:18 -0700)]
camera: Use new camera_metadata structure validation functions

* Reject unvalidated metadata across binder boundaries
* Sanity check in-process CameraMetadata when mutating data

Bug: 8713951
Change-Id: I121d8e15f8fdc9cdbbaf27dfd947813e11831e1c

11 years agoMerge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb...
Igor Murashkin [Thu, 2 May 2013 23:03:48 +0000 (23:03 +0000)]
Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev

11 years agocamera3: Don't eagerly finish configuring bidi streams more than once
Igor Murashkin [Thu, 2 May 2013 21:59:28 +0000 (14:59 -0700)]
camera3: Don't eagerly finish configuring bidi streams more than once

Finishing all stream configuration immediately is good, but when a stream is
both input and output it attempted to finish configuring bidi streams twice.
Since all ZSL streams are bidi, when we had a ZSL stream active preview would
immediately stop working.

Bug: 8563838
Change-Id: Iec998f11f6405fc15f3f31bd7cd29f03a7968d14

11 years agoA reference to the psi section data could become invalid if more
Andreas Huber [Mon, 29 Apr 2013 20:17:50 +0000 (13:17 -0700)]
A reference to the psi section data could become invalid if more

sections were added to the KeyedVector.

Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug: 8754565

11 years agoMerge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
Eino-Ville Talvala [Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)]
Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev

11 years agoMerge "The software FLAC encoder now properly signals an error if client" into jb...
Andreas Huber [Thu, 2 May 2013 21:17:20 +0000 (21:17 +0000)]
Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev

11 years agoMerge "Don't even try to verify the native resolution validity a" into jb-mr2-dev
Andreas Huber [Thu, 2 May 2013 21:16:23 +0000 (21:16 +0000)]
Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev

11 years agoMerge "Fix miracast source code to ignore the encoder output format change" into...
Andreas Huber [Thu, 2 May 2013 21:16:08 +0000 (21:16 +0000)]
Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev

11 years agocamera3: Don't crash when taking a still capture with ZSL disabled
Igor Murashkin [Thu, 2 May 2013 18:53:00 +0000 (11:53 -0700)]
camera3: Don't crash when taking a still capture with ZSL disabled

Bug: 8790212
Change-Id: I4bf7ac5ab856b0ea1738844182efb86137e14083

11 years agoMerge "Fix reverb at 48kHz" into jb-mr2-dev
Eric Laurent [Wed, 1 May 2013 23:53:44 +0000 (23:53 +0000)]
Merge "Fix reverb at 48kHz" into jb-mr2-dev

11 years agoFix reverb at 48kHz
Eric Laurent [Wed, 1 May 2013 23:15:49 +0000 (16:15 -0700)]
Fix reverb at 48kHz

The LVM reverb wrapper had a test to only accept input
sampling rate of 44.1 kHz. As the LVM reberb engine
supports multiple sampling rate we can remove this test.

The fix for issue 8512027 (commit 2a9c5cd4) caused a regression
because the framework now checks the return code of the effect
configure command and ignores subsequent commands in case of error.

Bug: 8630044
Change-Id: I3146871f1ad8f7945a2e63ea763dd7b87368337d

11 years agoFix miracast source code to ignore the encoder output format change
Andreas Huber [Wed, 1 May 2013 23:03:28 +0000 (16:03 -0700)]
Fix miracast source code to ignore the encoder output format change

it doesn't care about.

Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805
related-to-bug: 8616651

11 years agoCamera2/3: Fix still image FOV reporting.
Eino-Ville Talvala [Mon, 29 Apr 2013 20:50:24 +0000 (13:50 -0700)]
Camera2/3: Fix still image FOV reporting.

Still FOV can vary as a function of the output sizes, with
the function depending on the HAL version.

Calculate and update the FOV whenever the output sizes might change.

Bug: 8484377
Change-Id: I56f2cc768a1e128a159b326588be55b2752db06e

11 years agoMerge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
Andreas Huber [Wed, 1 May 2013 21:47:29 +0000 (21:47 +0000)]
Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev

11 years agoDon't even try to verify the native resolution validity a
Andreas Huber [Wed, 1 May 2013 21:13:26 +0000 (14:13 -0700)]
Don't even try to verify the native resolution validity a

miracast sink advertises, even if it were valid we couldn't use it
since it's not consistently implemented by sinks.

Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af
related-to-bug: 8772006

11 years agoThe software FLAC encoder now properly signals an error if client
Andreas Huber [Wed, 1 May 2013 20:58:36 +0000 (13:58 -0700)]
The software FLAC encoder now properly signals an error if client

attempts to configure it with too large an input buffer size.
Previously this would lead to memory corruption during encoding due to a
typo.

Change-Id: I229b07b7dbe87fb8424419706671b66a8d58ec6b
related-to-bug: 8778893

11 years agoMerge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev
Igor Murashkin [Wed, 1 May 2013 18:25:44 +0000 (18:25 +0000)]
Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev

11 years agoCamera3: Add missing buffer listener include (for ZSL)
Igor Murashkin [Wed, 1 May 2013 18:18:40 +0000 (11:18 -0700)]
Camera3: Add missing buffer listener include (for ZSL)

Bug: 8563838
Change-Id: Ie053655f5583d20003abdabccee68980d7cdcbfd

11 years agoMerge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
Igor Murashkin [Wed, 1 May 2013 17:48:57 +0000 (17:48 +0000)]
Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev

* changes:
  Camera3: Add ZSL stream support
  camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
  Camera3: Add input stream support

11 years agoSupport MediaCodec::getOutputFormat for encoders
Andreas Huber [Tue, 30 Apr 2013 23:08:47 +0000 (16:08 -0700)]
Support MediaCodec::getOutputFormat for encoders

codec specific data is provided as part of the MediaFormat if available.

Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e
related-to-bug: 8616651

11 years agoCamera: Don't complain repeatedly about missing android.led.availableLeds
Igor Murashkin [Tue, 30 Apr 2013 20:06:15 +0000 (13:06 -0700)]
Camera: Don't complain repeatedly about missing android.led.availableLeds

Bug: 8765726
Change-Id: I78f5f98315068aaad3a39d56698b9c8a18cc8f4a

11 years agoCamera3: Add ZSL stream support
Igor Murashkin [Mon, 22 Apr 2013 21:03:54 +0000 (14:03 -0700)]
Camera3: Add ZSL stream support

Bug: 8563838

Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766

11 years agocamera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Igor Murashkin [Mon, 29 Apr 2013 17:31:06 +0000 (10:31 -0700)]
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames

Bug: 8563838
Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72

11 years agoMerge "ProCamera: Add security permission checks for disabling transmit LED" into...
Igor Murashkin [Sat, 27 Apr 2013 00:43:13 +0000 (00:43 +0000)]
Merge "ProCamera: Add security permission checks for disabling transmit LED" into jb-mr2-dev

11 years agoMerge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev
Eino-Ville Talvala [Sat, 27 Apr 2013 00:10:38 +0000 (00:10 +0000)]
Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev

11 years agoCamera3: Add input stream support
Igor Murashkin [Mon, 15 Apr 2013 21:59:22 +0000 (14:59 -0700)]
Camera3: Add input stream support

- Untested with actual CAMERA3_STREAM_INPUT streams.

Bug: 8629088

Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1

11 years agoCamera2: Fix deadlock on shutdown due to client getting killed.
Eino-Ville Talvala [Tue, 23 Apr 2013 22:16:57 +0000 (15:16 -0700)]
Camera2: Fix deadlock on shutdown due to client getting killed.

When the binder connection dies and is the only holder of a strong
pointer to the Camera2Client, disconnect is called from the
destructor. At this point, all weak pointers to Camera2Client are no
longer promotable, and lots of cleanup code paths are broken as a
result.

Rework all such code paths to not need the client pointer, and to
discard image buffers that arrive during shutdown.

Bug: 8696047
Change-Id: Ic0672ecde7c1baaf65079f925a45bd5be45f1fb3

11 years agoMerge "Handle the case where an asynchronous prepare was initiated and then" into...
Andreas Huber [Thu, 25 Apr 2013 22:32:19 +0000 (22:32 +0000)]
Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev

11 years agoHandle the case where an asynchronous prepare was initiated and then
Andreas Huber [Thu, 25 Apr 2013 22:11:19 +0000 (15:11 -0700)]
Handle the case where an asynchronous prepare was initiated and then

the mediaplayer was reset.

Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41
related-to-bug: 8688986