OSDN Git Service
Glenn Kasten [Wed, 17 Oct 2012 22:09:23 +0000 (15:09 -0700)]
am
e89e9c78: am
108e1961: Merge "Tweak the SINC resampler parameters and double the performance. It\'s using about 10% CPU in the worse case now."
* commit '
e89e9c78fd2ca3d1887ac0e2cd64a9d8265680c1':
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Glenn Kasten [Wed, 17 Oct 2012 22:09:22 +0000 (15:09 -0700)]
am
9ad8de3b: am
a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
* commit '
9ad8de3b01ec276b84a8d6b70f49cc08a70e9bcd':
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Glenn Kasten [Wed, 17 Oct 2012 22:09:21 +0000 (15:09 -0700)]
am
f0d3f344: am
5e8e3fc3: Merge "fix a few small typos in the FIR computation"
* commit '
f0d3f344b4572832d3780de049a59b3eb8b995fb':
fix a few small typos in the FIR computation
Glenn Kasten [Wed, 17 Oct 2012 22:09:20 +0000 (15:09 -0700)]
am
00f8cde8: am
d2186701: Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
* commit '
00f8cde8584e184105879a01a276b8391d192273':
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Glenn Kasten [Wed, 17 Oct 2012 22:07:02 +0000 (15:07 -0700)]
am
108e1961: Merge "Tweak the SINC resampler parameters and double the performance. It\'s using about 10% CPU in the worse case now."
* commit '
108e1961ffb858374dcb39115d1dd831a4a4a75c':
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Glenn Kasten [Wed, 17 Oct 2012 22:07:00 +0000 (15:07 -0700)]
am
a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
* commit '
a19c810289392e5733463703e865c7ae407868ad':
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Glenn Kasten [Wed, 17 Oct 2012 22:06:56 +0000 (15:06 -0700)]
am
5e8e3fc3: Merge "fix a few small typos in the FIR computation"
* commit '
5e8e3fc30111534858fbd1f52a92e5128613af0e':
fix a few small typos in the FIR computation
Glenn Kasten [Wed, 17 Oct 2012 22:06:55 +0000 (15:06 -0700)]
am
d2186701: Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
* commit '
d218670119dc19fbbc5c804ae3ab7c0a5dd985d8':
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Glenn Kasten [Wed, 17 Oct 2012 21:37:19 +0000 (14:37 -0700)]
Merge "Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now."
Glenn Kasten [Wed, 17 Oct 2012 21:37:00 +0000 (14:37 -0700)]
Merge "A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
Glenn Kasten [Wed, 17 Oct 2012 21:36:35 +0000 (14:36 -0700)]
Merge "fix a few small typos in the FIR computation"
Glenn Kasten [Wed, 17 Oct 2012 21:36:09 +0000 (14:36 -0700)]
Merge "This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler."
Mathias Agopian [Tue, 30 Oct 2007 06:44:25 +0000 (23:44 -0700)]
Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
Change-Id: I50ac7e6c6702a427fa36ab6d976c507155057507
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Mon, 29 Oct 2007 11:34:36 +0000 (04:34 -0700)]
A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
Change-Id: I80eb5185e13ebdb907e0b85c49ba1272c23d60ec
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Fri, 24 Aug 2007 04:01:28 +0000 (21:01 -0700)]
fix a few small typos in the FIR computation
Change-Id: I6e56b514fe520f30f7487f85c64ea5d2a7c19b40
Signed-off-by: Glenn Kasten <gkasten@google.com>
Mathias Agopian [Thu, 23 Aug 2007 10:16:02 +0000 (03:16 -0700)]
This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
Change-Id: I99be2505139b8e0e7647200e1647509d4f7e6067
Signed-off-by: Glenn Kasten <gkasten@google.com>
Eino-Ville Talvala [Wed, 17 Oct 2012 00:03:53 +0000 (17:03 -0700)]
am
ed653a35: am
ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
* commit '
ed653a35784969b7d36e8b36bd421e2a54def0de':
Camera2: Improve quirks focusing behavior.
Eino-Ville Talvala [Wed, 17 Oct 2012 00:01:52 +0000 (17:01 -0700)]
am
ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-dev
* commit '
ecfbc952d51c71832f739b7483dcc8cb5fe68038':
Camera2: Improve quirks focusing behavior.
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:34:52 +0000 (11:34 -0700)]
am
aa00830e: am
bbe11e46: Merge "Fix track estimation for presentation complete" into jb-mr1-dev
* commit '
aa00830e46cb7494af7217246788c1bca83b1d04':
Fix track estimation for presentation complete
Jean-Michel Trivi [Tue, 16 Oct 2012 18:31:54 +0000 (11:31 -0700)]
am
bbe11e46: Merge "Fix track estimation for presentation complete" into jb-mr1-dev
* commit '
bbe11e46faf8f9e3296431993c36d3efc61337b5':
Fix track estimation for presentation complete
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
Eino-Ville Talvala [Tue, 16 Oct 2012 18:17:16 +0000 (11:17 -0700)]
am
74a7bcc0: am
54717320: Camera2: Don\'t touch frame counter on output frames.
* commit '
74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8':
Camera2: Don't touch frame counter on output frames.
Eino-Ville Talvala [Tue, 16 Oct 2012 18:14:28 +0000 (11:14 -0700)]
am
54717320: Camera2: Don\'t touch frame counter on output frames.
* commit '
547173205b3fd909dd72b597f6372840c38460e4':
Camera2: Don't touch frame counter on output frames.
Eino-Ville Talvala [Tue, 16 Oct 2012 18:07:54 +0000 (11:07 -0700)]
am
522fa119: am
d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigger HAL.
* commit '
522fa119fe2745cd950b6216ad6b49587372b7b3':
Camera2: When focus is already locked in CAF mode, do not trigger HAL.
Eino-Ville Talvala [Tue, 16 Oct 2012 18:06:11 +0000 (11:06 -0700)]
am
d6cc4a62: Camera2: When focus is already locked in CAF mode, do not trigger HAL.
* commit '
d6cc4a62f3d94cad4dd36bd0a844ba8764177d26':
Camera2: When focus is already locked in CAF mode, do not trigger HAL.
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
Glenn Kasten [Mon, 15 Oct 2012 21:58:39 +0000 (14:58 -0700)]
am
2e5aa980: Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aosp
* commit '
2e5aa980c9eba995d99aa13e6b5fa2714dc9f61e':
Fix log spam: Failed to open libwvm.so
Glenn Kasten [Mon, 15 Oct 2012 21:54:31 +0000 (14:54 -0700)]
Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aosp
The Android Open Source Project [Mon, 15 Oct 2012 14:42:48 +0000 (07:42 -0700)]
am
f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
f93f5bf4a48df3b1557734a1e945b9556ce16f92':
The Android Open Source Project [Mon, 15 Oct 2012 14:38:34 +0000 (07:38 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I427041221d8f8f3237c806f3d8a3f67c0b3a4242
Glenn Kasten [Fri, 12 Oct 2012 22:59:28 +0000 (15:59 -0700)]
Fix log spam: Failed to open libwvm.so
Bug:
7342813
Change-Id: I98852f036e4679a653723fc2bf1435d6e9d7d34c
James Dong [Fri, 12 Oct 2012 18:10:36 +0000 (11:10 -0700)]
am
954f6afe: am
b4a55269: Fix some missing checks against missing codecs
* commit '
954f6afed22e8a723ddb9a6448c14bce4e008a9c':
Fix some missing checks against missing codecs
James Dong [Fri, 12 Oct 2012 18:03:43 +0000 (11:03 -0700)]
am
b4a55269: Fix some missing checks against missing codecs
* commit '
b4a55269a5b39c73de2cc1d4013d0631ef18c77d':
Fix some missing checks against missing codecs
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 Open Source Project [Thu, 11 Oct 2012 15:08:21 +0000 (08:08 -0700)]
am
8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8616d32f7382563a1aea192e835b2cbbefd9f481':
The Android Open Source Project [Thu, 11 Oct 2012 15:04:39 +0000 (08:04 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I81df464c8faae1c41e8e1b8f0da8337e64c3fd09
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
The Android Open Source Project [Thu, 11 Oct 2012 12:59:17 +0000 (05:59 -0700)]
am
2ad5a49a: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
2ad5a49adfefa0d9c34ec9ea387fc7a30f1e7be6':
The Android Open Source Project [Thu, 11 Oct 2012 12:57:06 +0000 (05:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ie5b35b4154bf8cc096620a99382b5137ebb5ca81
Eino-Ville Talvala [Thu, 11 Oct 2012 00:52:31 +0000 (17:52 -0700)]
am
cb3911d3: am
a14be593: Camera2: Don\'t error out of startPreview when already recording.
* commit '
cb3911d30c515e06fbea0000af02fa3d09688943':
Camera2: Don't error out of startPreview when already recording.
Eino-Ville Talvala [Thu, 11 Oct 2012 00:51:31 +0000 (17:51 -0700)]
am
a14be593: Camera2: Don\'t error out of startPreview when already recording.
* commit '
a14be59340219c47639ec77a352d2af362551a6f':
Camera2: Don't error out of startPreview when already recording.
Jean-Michel Trivi [Thu, 11 Oct 2012 00:23:19 +0000 (17:23 -0700)]
am
0f95fadb: am
7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '
0f95fadb8a3ee402f2c51a932a06f1f685ab2d35':
Support querying active record sources
Eino-Ville Talvala [Thu, 11 Oct 2012 00:22:53 +0000 (17:22 -0700)]
am
f5230955: am
907e5651: Camera2: Don\'t let unlocks happen during recording.
* commit '
f52309555013e9909b248374f96d22dae29f6454':
Camera2: Don't let unlocks happen during recording.
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:36:04 +0000 (16:36 -0700)]
am
7e2c0a15: Merge "Support querying active record sources" into jb-mr1-dev
* commit '
7e2c0a15bb8086460070811a152029726479a297':
Support querying active record sources
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 23:17:11 +0000 (16:17 -0700)]
am
907e5651: Camera2: Don\'t let unlocks happen during recording.
* commit '
907e5651c18d0e25073743a49a685fe1a385939a':
Camera2: Don't let unlocks happen during recording.
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 [Wed, 10 Oct 2012 20:19:18 +0000 (13:19 -0700)]
am
6f846139: am
55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
* commit '
6f846139d97ad6cccdd2f243ccf3a19036ad12c7':
Camera2: Do not set auto-white-balance regions from metering regions.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:17:01 +0000 (13:17 -0700)]
am
55f6c9df: Camera2: Do not set auto-white-balance regions from metering regions.
* commit '
55f6c9dfd713776e251655b3ddd496b17df0926e':
Camera2: Do not set auto-white-balance regions from metering regions.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:07:01 +0000 (13:07 -0700)]
am
e44d7f83: am
c0379204: Camera: Limit valid caller PIDs for camera clients.
* commit '
e44d7f83a4d04b90417684d74f18ad8c703b981a':
Camera: Limit valid caller PIDs for camera clients.
Eino-Ville Talvala [Wed, 10 Oct 2012 20:05:48 +0000 (13:05 -0700)]
am
c0379204: Camera: Limit valid caller PIDs for camera clients.
* commit '
c03792041b9dd6f7f54abd6c82bd6c755a336cd8':
Camera: Limit valid caller PIDs for camera clients.
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
The Android Open Source Project [Wed, 10 Oct 2012 16:47:53 +0000 (09:47 -0700)]
am
6c839563: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
6c8395633d4ed9f88888e6df0ae2f33fd8401fd0':
The Android Open Source Project [Wed, 10 Oct 2012 16:44:29 +0000 (09:44 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I0a56a7cd77b8d52e699455b6bd01b884bcc32bc4
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
Eino-Ville Talvala [Wed, 10 Oct 2012 15:39:58 +0000 (08:39 -0700)]
am
4c7b3129: am
2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
* commit '
4c7b312964b2430ccc1f99e99092cc870be2a293':
Camera: Clear Hardware device pointer when initialization fails
Eino-Ville Talvala [Wed, 10 Oct 2012 15:37:33 +0000 (08:37 -0700)]
am
2b0db6ae: Merge "Camera: Clear Hardware device pointer when initialization fails" into jb-mr1-dev
* commit '
2b0db6aea3be519334f340ca97581db902196690':
Camera: Clear Hardware device pointer when initialization fails
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:18:17 +0000 (16:18 -0700)]
am
1f9300d9: am
73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev
* commit '
1f9300d9f0050b972ee6dd6c39b362baf8528a38':
Switch audio mode based on dongle's capabilities
Andreas Huber [Tue, 9 Oct 2012 23:16:15 +0000 (16:16 -0700)]
am
73125afc: Merge "Switch audio mode based on dongle\'s capabilities" into jb-mr1-dev
* commit '
73125afc0333c9aba37749e605537342caca11cd':
Switch audio mode based on dongle's capabilities
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:30:44 +0000 (15:30 -0700)]
am
754cbdd2: am
dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
* commit '
754cbdd2dd3376bb2b55d762c2909f816bd768cc':
Camera2: Fix uninitialized parameters.
Eino-Ville Talvala [Tue, 9 Oct 2012 22:28:00 +0000 (15:28 -0700)]
am
dca0ac21: Merge "Camera2: Fix uninitialized parameters." into jb-mr1-dev
* commit '
dca0ac2193e87c57d871dd208073107408c13c0a':
Camera2: Fix uninitialized parameters.
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:54:40 +0000 (13:54 -0700)]
am
e4664bb0: am
3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
* commit '
e4664bb098a9b7d6ae1a93486456eff71eaae1bf':
Camera2: Call onAutoFocus immediately for fixed-focus cameras
Igor Murashkin [Tue, 9 Oct 2012 20:53:17 +0000 (13:53 -0700)]
am
3d84d38e: Merge "Camera2: Call onAutoFocus immediately for fixed-focus cameras" into jb-mr1-dev
* commit '
3d84d38e7ac02b47d17f4bb272f18f8b0e873104':
Camera2: Call onAutoFocus immediately for fixed-focus cameras
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:17:38 +0000 (12:17 -0700)]
am
240a538b: am
d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
* commit '
240a538b59b905b68d46e39d79c8d48d1662161c':
Camera2: Move non-ZSL shutter sound firing to be later.
Eino-Ville Talvala [Tue, 9 Oct 2012 19:15:58 +0000 (12:15 -0700)]
am
d016cf5b: Merge "Camera2: Move non-ZSL shutter sound firing to be later." into jb-mr1-dev
* commit '
d016cf5b12cb73bd49bcecb0d5a4958df23620c3':
Camera2: Move non-ZSL shutter sound firing to be later.
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:34:32 +0000 (11:34 -0700)]
am
80dfc5dc: am
350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
* commit '
80dfc5dc7ec6d20beb0360e8efcc5331f4d25d06':
audio policy: deprecate ro.camera.sound.forced
Eric Laurent [Tue, 9 Oct 2012 18:32:31 +0000 (11:32 -0700)]
am
350d3b68: Merge "audio policy: deprecate ro.camera.sound.forced" into jb-mr1-dev
* commit '
350d3b686357a159fb1a962bbd41e01924d27cad':
audio policy: deprecate ro.camera.sound.forced
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 Open Source Project [Tue, 9 Oct 2012 14:31:59 +0000 (07:31 -0700)]
am
df81a1aa: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
df81a1aa1e89da71f02307f7eddb3d1ca5ee4a55':
Camera2: Don't promote weak IBinder ptrs to strong ones
The Android Open Source Project [Tue, 9 Oct 2012 14:29:10 +0000 (07:29 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I2d81c143dd737e9faf93df9a104d79f7f36fd429
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:25:29 +0000 (22:25 -0700)]
am
843aba43: am
2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
* commit '
843aba43ef85f5a40db03e0f384ed096b03592d0':
Camera2: Always disconnect in the client destructor
Eino-Ville Talvala [Tue, 9 Oct 2012 05:23:37 +0000 (22:23 -0700)]
am
2458d482: Merge "Camera2: Always disconnect in the client destructor" into jb-mr1-dev
* commit '
2458d482c4822c6f9e6274f5bd12b6aea095a9cd':
Camera2: Always disconnect in the client destructor
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
Igor Murashkin [Mon, 8 Oct 2012 23:22:39 +0000 (16:22 -0700)]
am
4a4253b9: am
82edd543: Camera2: isSmoothZoomSupported should return FALSE
* commit '
4a4253b979586c9de21425f5e3cb34da9f1e57de':
Camera2: isSmoothZoomSupported should return FALSE
Alex Ray [Mon, 8 Oct 2012 23:21:43 +0000 (16:21 -0700)]
am
9ea63b3b: am
6f854608: Camera2: Set default flash mode to FLASH_OFF
* commit '
9ea63b3bfd696bcce9cb28e86218a3449dd699d8':
Camera2: Set default flash mode to FLASH_OFF
OSDN Git Service
