OSDN Git Service
The Android Open Source Project [Tue, 6 Nov 2012 20:16:54 +0000 (12:16 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993
Glenn Kasten [Wed, 17 Oct 2012 19:16:50 +0000 (12:16 -0700)]
Ignore SIGPIPE during write() to broken pipe
This happens occasionally when taking a bugreport.
Bug:
6447319
Change-Id: Ia6531a4a3658461f8fd3f7106e7996da7cc5933a
The Android Automerger [Fri, 2 Nov 2012 02:05:16 +0000 (19:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Thu, 1 Nov 2012 22:48:44 +0000 (15:48 -0700)]
Make video encoders' bitrate mode (constant, variable, ...) configurable
through the desired output format. Configure the video encoder to use
constant bitrate mode for WFD.
Change-Id: Id7bd619598153c13448a9c5acd69d80f8a01f333
related-to-bug:
7459597
The Android Automerger [Thu, 1 Nov 2012 01:33:54 +0000 (18:33 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 30 Oct 2012 22:53:03 +0000 (15:53 -0700)]
Various tweaks to wfd
related-to-bug:
7426218
Squashed commit of the following:
commit
1553f1a1c66af998674168f7f7a3be23fcb0c794
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:51:27 2012 -0700
Add LPCM, AVC and AVC HRD descriptors as necessary.
Change-Id: Ibc836fced0fe37e8a25574c2295e886765b9ea6f
commit
4e74db61d2d31ebe239acbdec8f110f88016a4ea
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:52 2012 -0700
added copyright headers to Sender.{cpp,h}
Change-Id: If615ccb8767e32bd83ed1f0f669acc39a72489f6
commit
7144bf8ae68c5cdb8faa6e219547aabbd750f04e
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 15:50:25 2012 -0700
Reenable suspension of the RepeaterSource
Change-Id: I765338fcde89c65e4b69be45a5949eba6bcdcf6f
commit
812164bcfa0699821d7d8eefcc0dff96b2e2cd08
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 14:03:50 2012 -0700
Add 2 stuffing bytes to the PES headers for audio tracks.
Change-Id: I8b9c634f6a565ab7fa7ecdb610f7d8557e0b139b
commit
a084a741a63015d47c92d99fcd8b980fe615dc7d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:38 2012 -0700
Fix PCM audio packetization in WFD.
Change-Id: I99a435f9fe6b4397f24d6c22afae5ae2505ffc14
commit
c5cb9369585f701f34bce41534940d5f9b59248f
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 13:19:12 2012 -0700
Support extraction of PCM audio from transport streams.
Change-Id: I28a0516756ebcb5587325b6588df013ac871ffb9
commit
b0a0512300ae037d6b39c2d04952d34b5fc12b2d
Author: Andreas Huber <andih@google.com>
Date: Tue Oct 30 08:54:13 2012 -0700
disable suspend of the RepeaterSource
Change-Id: Ibf42a98185b0567f817ae582a82e6580f95d3d40
commit
4330e8b7668dc92a6d882b5622c0697cf292d04c
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 14:11:25 2012 -0700
Better handling of datagrams in ANetworkSession
reduce unnecessary copy overhead.
Change-Id: I2ed8c767274ba07764f03e8d4913041168e5755f
commit
a44e73c322ba3f2c336f7cc4e1d63d3a74faa75d
Author: Andreas Huber <andih@google.com>
Date: Mon Oct 29 11:14:47 2012 -0700
Network traffic is now handled on a separate thread.
Audio and video are queued to ensure proper A/V interleaving.
Scheduled packet sends according to capture timestamps to reduce
send-jitter.
Change-Id: Ibd6357c1e663086cf87bec0a98f8e54dfdfaa0e5
related-to-bug:
7426218
Change-Id: Ia440129d656c35814abf18df06da50b73d5bb554
The Android Automerger [Mon, 29 Oct 2012 18:19:49 +0000 (11:19 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Sat, 27 Oct 2012 06:49:43 +0000 (23:49 -0700)]
Increase bitrate now that other issues have been resolved.
Bug:
7426218
Change-Id: I67dfa1e4b85f326f355ad0ec5b6c699e87b45564
The Android Automerger [Sat, 27 Oct 2012 01:17:33 +0000 (18:17 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Fri, 26 Oct 2012 23:24:43 +0000 (16:24 -0700)]
Disable silence suppression (causes issues with dongles).
Bug:
7426218
Change-Id: Ie1517a8017bae1f9a9b6c224cd3170dfcc5fb941
The Android Automerger [Thu, 25 Oct 2012 20:42:11 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Thu, 25 Oct 2012 00:30:30 +0000 (17:30 -0700)]
Camera2: Don't hold locks while waiting to sync.
Bug:
7409877
Change-Id: Ia3a0bc4f0ab4e19fca868ba04a870cf8e8ee7adb
The Android Automerger [Tue, 23 Oct 2012 23:46:59 +0000 (16:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 23 Oct 2012 22:06:11 +0000 (15:06 -0700)]
Merge "Don't attempt to seek audio and video separately." into jb-mr1-dev
The Android Automerger [Tue, 23 Oct 2012 21:37:12 +0000 (14:37 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 23 Oct 2012 20:25:05 +0000 (13:25 -0700)]
Don't attempt to seek audio and video separately.
The widevine extractor doesn't deal too well with that...
Change-Id: Iadfeede4fe0c086af788c5639782854e4fbb98ff
related-to-bug:
7262386
Eino-Ville Talvala [Tue, 23 Oct 2012 17:31:25 +0000 (10:31 -0700)]
Merge "Camera2: Increase mode update timeout." into jb-mr1-dev
Eino-Ville Talvala [Tue, 23 Oct 2012 16:09:01 +0000 (09:09 -0700)]
Camera2: Increase mode update timeout.
During camera startup, it might take a few hundred milliseconds before
requests start to be dequeued by the HAL. Increase the timeout for
synchronizing mode changes and triggers so that triggers near startup
don't time out.
Bug:
6970465
Change-Id: I9dc35378e8018ec18ae31be874fcb094f8a9a0e9
Eric Laurent [Tue, 23 Oct 2012 15:28:07 +0000 (08:28 -0700)]
Merge "stagefright: discard audio at start of capture" into jb-mr1-dev
Eric Laurent [Tue, 23 Oct 2012 00:44:24 +0000 (17:44 -0700)]
stagefright: discard audio at start of capture
The new camcorder start sound is longer than previous one and we
must discard more audio when capture starts.
Ideally, camcorder should use synchronous record start.
Bug
7394330.
Change-Id: I219b4e231aba706776dc7ccc4f1c996eaf22f61a
Glenn Kasten [Tue, 23 Oct 2012 00:09:27 +0000 (17:09 -0700)]
Increase allowed number of VHQ resamplers to 3
Bug:
7378660
Change-Id: I69e33ca2eb4bb9bd38e2c63df62cd1130d68baf6
The Android Automerger [Mon, 22 Oct 2012 23:41:58 +0000 (16:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 22 Oct 2012 18:47:39 +0000 (11:47 -0700)]
Merge "Fix a typo that caused the high quality resampler to produce garbage" into jb-mr1-dev
Andreas Huber [Mon, 22 Oct 2012 17:45:08 +0000 (10:45 -0700)]
WFD use of HDCP is now optional.
if the sink supports it we'll use HDCP (and fail if necessary), if it doesn't
we won't. If an HDCP session is established we'll tell our observer that
the connection is secure, otherwise we don't.
Change-Id: I7cbef384f2cf0a6ac65801c581eea227b9ef4c46
related-to-bug:
7368436
Mathias Agopian [Sun, 21 Oct 2012 10:04:05 +0000 (03:04 -0700)]
Fix a typo that caused the high quality resampler to produce garbage
the problem is that if libaudio_resampler is present, it is those
coefficients that will always be selected, but the correct
meta-data.
Bug:
7385994
Change-Id: Ieebeb37b4dfb62a1a051bc29fae2ce056dbc6621
The Android Automerger [Sun, 21 Oct 2012 06:14:02 +0000 (23:14 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Sat, 20 Oct 2012 00:21:55 +0000 (17:21 -0700)]
Merge "AAC DRC reference level for mobile is -16dB" into jb-mr1-dev
Eino-Ville Talvala [Fri, 19 Oct 2012 23:47:32 +0000 (16:47 -0700)]
Merge "Camera2: Fix potential deadlock" into jb-mr1-dev
The Android Automerger [Fri, 19 Oct 2012 22:46:06 +0000 (15:46 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jean-Michel Trivi [Fri, 19 Oct 2012 21:52:16 +0000 (14:52 -0700)]
AAC DRC reference level for mobile is -16dB
Use -16dB as the default DRC reference level when decoding streams
with DRC metadata.
Bug
7370764
Change-Id: I900cee22f32384a5657fb041b69d42657bcddf09
Marco Nelissen [Fri, 19 Oct 2012 19:36:47 +0000 (12:36 -0700)]
Merge "Fix valgrind issues" into jb-mr1-dev
Glenn Kasten [Thu, 18 Oct 2012 22:51:31 +0000 (15:51 -0700)]
Remove active track when thread goes to standby
Bug:
7369232
Change-Id: I7ff9f525dad4be0aef562a53015b06ee7d3d50f1
The Android Automerger [Thu, 18 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 17 Oct 2012 23:32:34 +0000 (16:32 -0700)]
Camera2: Fix potential deadlock
setPreviewWindow was holding a lock during long-lasting HAL calls
which may cause deadlock if the HAL calls back into the service during
the call. Stop holding the lock during these calls, since it's not
essential to do so.
Bug:
7320517
Change-Id: I4a35703d751e22ac32979b5a1288e291610576e7
James Dong [Wed, 17 Oct 2012 21:53:16 +0000 (14:53 -0700)]
Added some extra failure logging messages
o related-to-bug:
7282066
Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
Marco Nelissen [Wed, 17 Oct 2012 17:57:02 +0000 (10:57 -0700)]
Fix valgrind issues
We were reading some uninitialized memory when creating bass boost and EQ
effects, and using memcpy() with identical source and destination.
Change-Id: I15ea1b2c52ae05cbf54aef04351e89805e0ebf8e
The Android Automerger [Wed, 17 Oct 2012 13:59:20 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:30:23 +0000 (17:30 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 16 Oct 2012 23:57:05 +0000 (16:57 -0700)]
Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
Eino-Ville Talvala [Tue, 16 Oct 2012 19:58:21 +0000 (12:58 -0700)]
Camera2: Improve quirks focusing behavior.
- When scene mode is set and the AF quirk is in use, don't change AF
mode and then cancel when AF cancel is received. Just change mode
since that also implies a cancel.
- Only trigger quirks switch when a focusing area is set.
Bug:
7318812
Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
Jean-Michel Trivi [Tue, 16 Oct 2012 18:27:24 +0000 (11:27 -0700)]
Merge "Fix track estimation for presentation complete" into jb-mr1-dev
Jean-Michel Trivi [Tue, 16 Oct 2012 17:29:01 +0000 (10:29 -0700)]
Fix track estimation for presentation complete
Audio tracks were not using the right latency estimation for
signalling the completion of their presetation. This caused
the synchronization mechanism between playback and record to be
off, and a synchronized recording would contain some of the audio
that was meant to be over once recording would start.
Use the playback thread's latency reporting which takes the audio
pipe into account.
Bug
7237669
Change-Id: I23a907a53ad0b0d68d246789ec595a77a79fced5
Eino-Ville Talvala [Tue, 16 Oct 2012 17:28:07 +0000 (10:28 -0700)]
Camera2: Don't touch frame counter on output frames.
Bug:
7357069
Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
Eino-Ville Talvala [Tue, 16 Oct 2012 17:17:30 +0000 (10:17 -0700)]
Camera2: When focus is already locked in CAF mode, do not trigger HAL.
In HAL2 CAF modes, once focus is locked by an AF trigger, additional
triggers will not cause AF notifications, since the state will not
change again until a cancelAutofocus call.
Since the old API still expects to see a notification, short-circuit
this at the service and send an immediate success notification.
Bug:
7318298
Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
The Android Automerger [Fri, 12 Oct 2012 17:26:32 +0000 (10:26 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 13:59:17 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Fri, 12 Oct 2012 03:28:50 +0000 (20:28 -0700)]
Fix some missing checks against missing codecs
o related-to-bug:
6971073
Change-Id: Ia6d926663231f9a9ef31c82c85c70595c4a30ebe
The Android Automerger [Thu, 11 Oct 2012 15:19:01 +0000 (08:19 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Thu, 11 Oct 2012 14:03:39 +0000 (07:03 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Thu, 11 Oct 2012 00:17:01 +0000 (17:17 -0700)]
Camera2: Don't error out of startPreview when already recording.
Bug:
7327474
Change-Id: I603da5b8bd58e5a700d7ae0b3d34bd89bbcb1d53
Jean-Michel Trivi [Wed, 10 Oct 2012 23:30:19 +0000 (16:30 -0700)]
Merge "Support querying active record sources" into jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 22:28:53 +0000 (15:28 -0700)]
Camera2: Don't let unlocks happen during recording.
Bug:
7309020
Change-Id: I6e66809b868d2e8f47f71e6f8752b44ec06dfb17
The Android Automerger [Wed, 10 Oct 2012 21:06:30 +0000 (14:06 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 06:58:02 +0000 (23:58 -0700)]
Camera2: Do not set auto-white-balance regions from metering regions.
Per API documentation, metering regions are only for AE, not also for AWB.
Bug:
7312720
Change-Id: I39bcf33e4c81e80022f45e8fca77ea6cf9ba115e
Jean-Michel Trivi [Wed, 10 Oct 2012 19:11:16 +0000 (12:11 -0700)]
Support querying active record sources
Add support for querying whether there is currently a recording
underway from the specified audio source.
Bug
7314859
Change-Id: I986b231a10ffd368b08ec2f9c7f348d28eaeb892
Eino-Ville Talvala [Wed, 10 Oct 2012 05:16:58 +0000 (22:16 -0700)]
Camera: Limit valid caller PIDs for camera clients.
Narrow down on PID checks to avoid cases where service can access the
camera even though it shouldn't be able to, per API semantics.
Bug:
6970469
Change-Id: Ic468a31949c28ef978b6ed48a70e4601c7ced684
The Android Automerger [Wed, 10 Oct 2012 15:50:21 +0000 (08:50 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Wed, 10 Oct 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 10 Oct 2012 04:57:37 +0000 (21:57 -0700)]
Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
Andreas Huber [Tue, 9 Oct 2012 23:11:27 +0000 (16:11 -0700)]
Merge "Switch audio mode based on dongle's capabilities" into jb-mr1-dev
The Android Automerger [Tue, 9 Oct 2012 23:07:19 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andreas Huber [Tue, 9 Oct 2012 22:53:34 +0000 (15:53 -0700)]
Switch audio mode based on dongle's capabilities
properly parse rtp port and use it to setup session.
Change-Id: Ic7521cb867143278196c3ce4b19a74ecc2703d8e
related-to-bug:
7318719
The Android Automerger [Tue, 9 Oct 2012 22:38:51 +0000 (15:38 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 22:22:46 +0000 (15:22 -0700)]
Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
Igor Murashkin [Tue, 9 Oct 2012 21:45:37 +0000 (14:45 -0700)]
Camera: Clear Hardware device pointer when initialization fails
When disconnecting, don't try to call device functions if the initialization
fails since this can lead to internal HAL segfaults.
Bug:
7317107
Change-Id: Ib65db7eb6556ee10d844959934b1bfd7bb08d0ff
Igor Murashkin [Tue, 9 Oct 2012 20:49:28 +0000 (13:49 -0700)]
Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 19:52:16 +0000 (12:52 -0700)]
Camera2: Fix uninitialized parameters.
Some parameters were not being set to default values, causing strange
flakiness in any app that wasn't calling setParameters. This includes
many CTS tests.
Bug:
6970468
Change-Id: If91635afc000e23862e7b039292a55349274c5ee
Eino-Ville Talvala [Tue, 9 Oct 2012 19:12:07 +0000 (12:12 -0700)]
Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
Eric Laurent [Tue, 9 Oct 2012 18:28:53 +0000 (11:28 -0700)]
Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
Igor Murashkin [Tue, 9 Oct 2012 01:05:12 +0000 (18:05 -0700)]
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Bug:
7311578
Change-Id: Ib8a8ea1f5fc269abdd24ed1e0370dc9b87b284ee
The Android Automerger [Tue, 9 Oct 2012 13:59:19 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Tue, 9 Oct 2012 05:20:47 +0000 (22:20 -0700)]
Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
Eino-Ville Talvala [Mon, 8 Oct 2012 05:43:48 +0000 (22:43 -0700)]
Camera2: Move non-ZSL shutter sound firing to be later.
Instead of firing shutter sound when capture request is submitted for
non-ZSL captures, fire it when the metadata frame is received. This
guarantees that the shutter sound fires after picture capture is
completed by the sensor.
Bug:
7259900
Change-Id: I4a1eeed89ed0400bf80b0f0cc2d5799c3d9bb9e3
Eric Laurent [Mon, 8 Oct 2012 23:00:36 +0000 (16:00 -0700)]
audio policy: deprecate ro.camera.sound.forced
The volume and routing policy of AUDIO_STREAM_ENFORCED_AUDIBLE is
now controlled by AudioService.
Do not read ro.camera.sound.forced is not needed anymore.
Bug
7032634.
Change-Id: Ic0a6396fc4b6efb91cdb4dffe0c8eb035d0440bd
Igor Murashkin [Mon, 8 Oct 2012 22:09:46 +0000 (15:09 -0700)]
Camera2: Always disconnect in the client destructor
If Camera2Client failed to initialize, it would skip disconnect step,
and thus the camera would be forever marked as busy. By always calling
disconnect it will always call free.
It also adds a new guarantee that Client::disconnect is idempotent
Bug:
7298182
Change-Id: Ic9876f1665b7d9b3c0da692880f63f165e3f4fa5
Igor Murashkin [Mon, 8 Oct 2012 21:08:32 +0000 (14:08 -0700)]
Camera2: isSmoothZoomSupported should return FALSE
Bug:
7308024
Change-Id: Ib757bef8f6dc203f8dfa6ea6d11191e3c7cfcc6d
Alex Ray [Mon, 8 Oct 2012 19:04:15 +0000 (12:04 -0700)]
Camera2: Set default flash mode to FLASH_OFF
Bug:
6970090
Change-Id: I904b1be2ee0710e82e8e647753a705184c10b46c
Igor Murashkin [Mon, 8 Oct 2012 20:10:48 +0000 (13:10 -0700)]
Merge "Camera2: Fix Parameters#setZoom off by 1 validation error" into jb-mr1-dev
Eino-Ville Talvala [Mon, 8 Oct 2012 19:17:36 +0000 (12:17 -0700)]
Merge "Camera2: On stopping preview, wait until captures are completed." into jb-mr1-dev
Igor Murashkin [Mon, 8 Oct 2012 18:16:03 +0000 (11:16 -0700)]
Camera2: Fix Parameters#setZoom off by 1 validation error
Bug:
7298683
Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d
Igor Murashkin [Mon, 8 Oct 2012 17:23:06 +0000 (10:23 -0700)]
Merge "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras" into jb-mr1-dev
Eino-Ville Talvala [Fri, 5 Oct 2012 19:03:10 +0000 (12:03 -0700)]
Camera2: On stopping preview, wait until captures are completed.
If preview is stopped while a still capture or a video snapshot is
underway, wait until the capture completes before stopping preview.
Also use the same behavior for disconnect - do not shut down the
camera device until captures are complete.
This works around HAL implementations which report to be done
(get_in_progress_count returns 0) even when a capture is still
outstanding.
Bug:
7276954
Change-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd
The Android Automerger [Mon, 8 Oct 2012 01:57:53 +0000 (18:57 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
ty.lee [Mon, 1 Oct 2012 04:54:14 +0000 (13:54 +0900)]
audioflinger/resampler: add build source for libaudio-resampler
Bug:
7229644
Change-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f
Signed-off-by: ty.lee <ty.lee@lge.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Automerger [Sun, 7 Oct 2012 13:59:17 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Sat, 6 Oct 2012 20:50:31 +0000 (13:50 -0700)]
Camera2: Fix off-by-one error in ZSL selection.
Bug:
7258126
Change-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd
Igor Murashkin [Sat, 6 Oct 2012 00:09:09 +0000 (17:09 -0700)]
Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras
Bug:
7298805
Change-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7
Eino-Ville Talvala [Fri, 5 Oct 2012 00:01:25 +0000 (17:01 -0700)]
Camera2: Unconditionally shut down streams on disconnect.
stopPreviewL may do nothing in certain states. Stop streams directly
to avoid those failures, so that we always maintain the HAL interface
invariant that streams referenced by in-flight requests are never
deleted.
Bug:
7276954
Change-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af
Igor Murashkin [Fri, 28 Sep 2012 22:30:03 +0000 (15:30 -0700)]
Camera2: Fix metering regions to take into account the current zoom/crop region
Also adds a quirk to disable this fix to work around for incompliant HALs
Bug:
7246065
Change-Id: I80bad25e56ba59149270238e5639bb33cae495ae
Igor Murashkin [Fri, 5 Oct 2012 17:44:57 +0000 (10:44 -0700)]
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug:
7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
Igor Murashkin [Thu, 4 Oct 2012 21:22:18 +0000 (14:22 -0700)]
Camera2: Change policy for calculating previewFpsRange from previewFps
Bug:
7259959
Change-Id: I759a559d7115201264f88db1f23edc2d6aef6c43
Igor Murashkin [Fri, 5 Oct 2012 18:35:53 +0000 (11:35 -0700)]
Merge "Camera2: Don't promote weak IBinder ptrs to strong ones" into jb-mr1-dev
Igor Murashkin [Fri, 5 Oct 2012 17:44:57 +0000 (10:44 -0700)]
Camera2: Don't promote weak IBinder ptrs to strong ones
The Binder driver does not support promoting weak pointers into strong
pointers. Occassionally the system would lock up when trying to do this
(when closing the camera app).
Bug:
7289040
Change-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871
The Android Automerger [Fri, 5 Oct 2012 13:59:26 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Igor Murashkin [Wed, 3 Oct 2012 23:02:09 +0000 (16:02 -0700)]
Camera2: Fix deadlock while zooming during record
Acquired SharedParameters before mMutex in StreamingProcessor,
this avoids any potential deadlocks since Camera2Client code would
always acquire SharedParameters first before invoking StreamingProcessor.
Bug:
7275259
Change-Id: Ia741162c455300378bee049f063590ece5328b95
Eino-Ville Talvala [Thu, 4 Oct 2012 07:56:40 +0000 (00:56 -0700)]
Camera2: Use the triggerAfWithAuto quirk
When this quirk is set, and a scene mode is enabled, do AF calls with
AF mode AUTO instead of whatever the scene more override AF mode is.
Bug:
7159577
Change-Id: I3ea6b8386abc0968047fc9bba3a35c5db5bdcfd3
Eino-Ville Talvala [Tue, 2 Oct 2012 20:30:28 +0000 (13:30 -0700)]
Camera2: Synchronize mode changes and triggers
Make sure that changes to various parameters have reached the HAL
before triggering asynchronous events like autofocus or precapture
metering.
Bug:
7107220
Change-Id: I3c50038de1671968eb32004ce538435121934e7e
Eino-Ville Talvala [Thu, 4 Oct 2012 23:30:46 +0000 (16:30 -0700)]
Merge "Camera2: Include JPEG settings in ZSL requests." into jb-mr1-dev
Andreas Huber [Thu, 4 Oct 2012 21:45:55 +0000 (14:45 -0700)]
Merge "Optionally emit LPCM audio instead of using AAC in wifi display code" into jb-mr1-dev
Eino-Ville Talvala [Thu, 4 Oct 2012 20:21:08 +0000 (13:21 -0700)]
Camera2: Include JPEG settings in ZSL requests.
Bug:
7287743
Change-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f