OSDN Git Service
The Android Open Source Project [Thu, 16 May 2013 12:43:29 +0000 (05:43 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b
Conley Owens [Wed, 15 May 2013 22:01:42 +0000 (15:01 -0700)]
Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp
-s ours so that jb-mr2-dev can continue fastforwarding to
jb-mr2-dev-plus-aosp.
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.
Eino-Ville Talvala [Wed, 15 May 2013 20:34:53 +0000 (13:34 -0700)]
am
7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
* commit '
7dd801bd108bff3e897e9e86c5f79f1ab05709d0':
Camera3: Fix fast flexible YUV->NV21 path.
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
The Android Automerger [Wed, 15 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Chong Zhang [Wed, 15 May 2013 02:14:52 +0000 (19:14 -0700)]
am
6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev
* commit '
6ed6a2e615e19d8c7c37e2a8ac017c01a74ba876':
wifi-display: misc fixes for M3 response parsing
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
Igor Murashkin [Wed, 15 May 2013 01:28:02 +0000 (18:28 -0700)]
am
083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds
* commit '
083a08ac82704fdcc37334a4253ff075f703cc87':
Camera: don't spam RingBufferConsumer logs in eng builds
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
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
Elliott Hughes [Tue, 14 May 2013 22:02:33 +0000 (15:02 -0700)]
am
effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
* commit '
effc08ed1eb1d55ca13997ec96f72e40a0866394':
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
Elliott Hughes [Tue, 14 May 2013 21:39:28 +0000 (21:39 +0000)]
Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
Glenn Kasten [Fri, 10 May 2013 16:29:51 +0000 (09:29 -0700)]
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
(cherry-pick of
da1a325bc0a1421f4233e62704da4fab8b0acf7b.)
Bug:
8895727
Change-Id: I29d5dcf8519600fdd2910345449c66a5c1284646
The Android Automerger [Tue, 14 May 2013 19:57:59 +0000 (12:57 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Conley Owens [Tue, 14 May 2013 18:07:14 +0000 (11:07 -0700)]
am
c650e6ab: am
72c324ef: Empty test commit for AOSP
* commit '
c650e6abe84bc3ba34b347c71d10c8b973738f35':
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
Igor Murashkin [Tue, 14 May 2013 18:03:36 +0000 (11:03 -0700)]
am
be03b28f: Merge "Camera: Pause preview when needing to delete jpeg/zsl streams" into jb-mr2-dev
* commit '
be03b28fb20b0f978ddd0fd04b637ede5de9bf1b':
Camera: Pause preview when needing to delete jpeg/zsl streams
Eric Laurent [Tue, 14 May 2013 18:03:36 +0000 (11:03 -0700)]
am
375379a4: Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev
* commit '
375379a4cb8dd7bfbd745407b5462bdf79888153':
Fix unreleased mutex in ToneGenerator stopTone()
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
Conley Owens [Tue, 14 May 2013 17:14:40 +0000 (10:14 -0700)]
Empty test commit for AOSP
Eric Laurent [Tue, 14 May 2013 15:44:43 +0000 (15:44 +0000)]
Merge "Fix unreleased mutex in ToneGenerator stopTone()" into jb-mr2-dev
The Android Automerger [Tue, 14 May 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
Igor Murashkin [Mon, 13 May 2013 20:48:46 +0000 (13:48 -0700)]
am
38ea629e: Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-dev
* commit '
38ea629ed2ccba17c763f697ced6d654a42bf699':
Camera3: Refactor stream code to be DRY
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
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
The Android Automerger [Mon, 13 May 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
Marco Nelissen [Sat, 11 May 2013 00:36:46 +0000 (17:36 -0700)]
am
0d24eb5e: Merge "Don\'t purge effects we\'re about to start using" into jb-mr2-dev
* commit '
0d24eb5e89963663150d38a320ec17244d39edf2':
Don't purge effects we're about to start using
Marco Nelissen [Sat, 11 May 2013 00:36:46 +0000 (17:36 -0700)]
am
519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev
* commit '
519f7624696cf43a7fafe21fd2108deaad0bfe4a':
Don't render buffers that have size 0
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
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
Eino-Ville Talvala [Sat, 11 May 2013 00:03:27 +0000 (17:03 -0700)]
am
1d74d78f: Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-dev
* commit '
1d74d78feb36aa08cfba696b67278cb6bbed6bd2':
Camera2/3: Optimize a few YCbCr_420_888 copy paths
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
Alex Ray [Fri, 10 May 2013 20:10:43 +0000 (13:10 -0700)]
am
da5405fb: Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev
* commit '
da5405fb0453d8a8ce99ab303599ecb4b47c6ccb':
Camera2: FoV quirk crop regions
Alex Ray [Fri, 10 May 2013 20:07:33 +0000 (20:07 +0000)]
Merge "Camera2: FoV quirk crop regions" into jb-mr2-dev
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
Eino-Ville Talvala [Fri, 10 May 2013 19:44:19 +0000 (12:44 -0700)]
am
747b8492: Camera3: Fix initial orientation configuration.
* commit '
747b84925886dec39cd7532637b9338054e649ef':
Camera3: 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
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
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
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
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
Igor Murashkin [Thu, 9 May 2013 19:05:05 +0000 (12:05 -0700)]
am
e464e15a: Merge "camera3: Manage fences properly when buffers are returned with an error" into jb-mr2-dev
* commit '
e464e15a31bb57754a227f5058299160e6d47ebb':
camera3: Manage fences properly when buffers are returned with an error
Igor Murashkin [Thu, 9 May 2013 19:04:59 +0000 (12:04 -0700)]
am
7fe6ac0d: Merge "camera2: Add height to the crop region metadata property" into jb-mr2-dev
* commit '
7fe6ac0de4b36f89a7f20dafb693e814344f9b4d':
camera2: Add height to the crop region metadata property
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
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
Eino-Ville Talvala [Thu, 9 May 2013 17:19:39 +0000 (10:19 -0700)]
am
19cb41fb: Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-dev
* commit '
19cb41fbee0218c51345844a59437ee8c087c970':
Camera3: Support flexible YUV for preview callbacks
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
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
The Android Automerger [Wed, 8 May 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Tue, 7 May 2013 23:57:52 +0000 (16:57 -0700)]
am
a5751c3a: Merge "Camera: Hotplug - conditionally transition to PRESENT when clients disconnect" into jb-mr2-dev
* commit '
a5751c3ade37923ef7b36c53c36bb55ef7076a3b':
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
Alex Ray [Tue, 7 May 2013 21:31:02 +0000 (14:31 -0700)]
Camera2: FoV quirk crop regions
Bug:
8484377
Change-Id: I5ffcc20b68dc92b502acc9898e57f12cadb92848
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
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
The Android Automerger [Tue, 7 May 2013 12:55:14 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Glenn Kasten [Tue, 7 May 2013 00:03:18 +0000 (17:03 -0700)]
am
831a0055: Fix Audioflinger crash when TeeSink is enabled
* commit '
831a0055665c3d15ff9c99ad23e5ab2b7346f2ac':
Fix 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
Igor Murashkin [Mon, 6 May 2013 18:11:47 +0000 (11:11 -0700)]
am
1a95a727: Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev
* commit '
1a95a7275f8263a4ee7775af57543f80c4d700a0':
camera: Use new camera_metadata structure validation functions
Igor Murashkin [Mon, 6 May 2013 18:11:46 +0000 (11:11 -0700)]
am
ef33d308: Merge "camera3: Don\'t eagerly finish configuring bidi streams more than once" into jb-mr2-dev
* commit '
ef33d3085fd5ac92e90af80a9fca729daa001eca':
camera3: Don't eagerly finish configuring bidi streams more than once
The Android Automerger [Mon, 6 May 2013 12:55:20 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to 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
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
Eric Laurent [Fri, 3 May 2013 18:19:06 +0000 (11:19 -0700)]
am
4170f515: Merge "Remove timing jitter during startup of audio" into jb-mr2-dev
* commit '
4170f515cd6148b952a07fcbe23364f5c76a2d9c':
Remove timing jitter during startup of audio
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
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
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
Igor Murashkin [Thu, 2 May 2013 23:05:48 +0000 (16:05 -0700)]
am
2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev
* commit '
2628bc9d1261c2942f3506baca348ccd71ea9c86':
camera3: Don't crash when taking a still capture with ZSL disabled
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
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
Andreas Huber [Thu, 2 May 2013 21:45:23 +0000 (14:45 -0700)]
am
f2ae7606: A reference to the psi section data could become invalid if more
* commit '
f2ae760602a948598a168ad43673bfbd9d50fc6b':
A 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
Eino-Ville Talvala [Thu, 2 May 2013 21:19:51 +0000 (14:19 -0700)]
am
a69f3213: Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
* commit '
a69f3213d122b09d04fb890efd6dbe87a8df4ecc':
Camera2/3: Fix still image FOV reporting.
Andreas Huber [Thu, 2 May 2013 21:19:51 +0000 (14:19 -0700)]
am
09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev
* commit '
09f842b03d8f9c0ab5e4541937f8061a7d1bf53d':
The software FLAC encoder now properly signals an error if client
Andreas Huber [Thu, 2 May 2013 21:19:51 +0000 (14:19 -0700)]
am
00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev
* commit '
00bbca96684cb995458fedd2e1f9dec5f047100b':
Don't even try to verify the native resolution validity a
Andreas Huber [Thu, 2 May 2013 21:19:50 +0000 (14:19 -0700)]
am
de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
* commit '
de6bf9cc0fd94452ffcd6685e1469092db74a454':
Fix miracast source code to ignore the encoder output format change
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
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
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
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
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
The Android Automerger [Thu, 2 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
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
Eric Laurent [Wed, 1 May 2013 23:55:59 +0000 (16:55 -0700)]
am
bf2bb00e: Merge "Fix reverb at 48kHz" into jb-mr2-dev
* commit '
bf2bb00e29f69b0de1cde8d31a6f1431d984388b':
Fix reverb at 48kHz
Eric Laurent [Wed, 1 May 2013 23:53:44 +0000 (23:53 +0000)]
Merge "Fix reverb at 48kHz" into jb-mr2-dev
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
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
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
Andreas Huber [Wed, 1 May 2013 21:49:02 +0000 (14:49 -0700)]
am
deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
* commit '
deff69107566cfe76dc33eff1b4250893956a244':
Support MediaCodec::getOutputFormat for encoders
Andreas Huber [Wed, 1 May 2013 21:47:29 +0000 (21:47 +0000)]
Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
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
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
Igor Murashkin [Wed, 1 May 2013 18:28:17 +0000 (11:28 -0700)]
am
3c7c39af: Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev
* commit '
3c7c39afbc8931ef2cec1bed3c477a19c139f87e':
Camera3: Add missing buffer listener include (for ZSL)
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
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
Igor Murashkin [Wed, 1 May 2013 17:50:31 +0000 (10:50 -0700)]
am
d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
* commit '
d24b0653c7620e07e92308c05b41f7df9943f83b':
Camera3: Add ZSL stream support
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Camera3: Add input stream support
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
The Android Automerger [Wed, 1 May 2013 12:55:37 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
OSDN Git Service
