OSDN Git Service
Andreas Huber [Fri, 28 Sep 2012 22:29:20 +0000 (15:29 -0700)]
am
bbe96f0f: Fix shutdown if HDCP was never instantiated.
* commit '
bbe96f0f05a1f1a1b3cfec0d124cb0d63c1ebf2a':
Fix shutdown if HDCP was never instantiated.
Andreas Huber [Fri, 28 Sep 2012 22:13:18 +0000 (15:13 -0700)]
Fix shutdown if HDCP was never instantiated.
Change-Id: Icdf6785880180f417c5432dff54c7e0fb12ef84d
related-to-bug:
7247918
Alex Ray [Fri, 28 Sep 2012 20:14:56 +0000 (13:14 -0700)]
am
23f74017: Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev
* commit '
23f74017a2c457a25382677b6e696c4cfa06cef5':
Camera2: Use new JPEG transport header
Alex Ray [Fri, 28 Sep 2012 20:12:28 +0000 (13:12 -0700)]
Merge "Camera2: Use new JPEG transport header" into jb-mr1-dev
Andreas Huber [Fri, 28 Sep 2012 19:52:52 +0000 (12:52 -0700)]
am
3a0ef0dc: Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.
* commit '
3a0ef0dc71f3776d115f30d87f1d8867daefea88':
Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.
Andreas Huber [Fri, 28 Sep 2012 18:34:41 +0000 (11:34 -0700)]
Tell the encoder to emit SPS/PPS before IDR frames in wifi display code.
Change-Id: Ic40e09b66784dd2e370d30b688d50561a47ab85a
related-to-bug:
7245308
Andreas Huber [Fri, 28 Sep 2012 18:06:02 +0000 (11:06 -0700)]
am
e646b2d2: Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev
* commit '
e646b2d26459ca30667097e9600ee3f57ebfd228':
Various improvements to a cleaner shutdown of the wifi display connection.
Andreas Huber [Fri, 28 Sep 2012 18:01:42 +0000 (11:01 -0700)]
Merge "Various improvements to a cleaner shutdown of the wifi display connection." into jb-mr1-dev
Alex Ray [Fri, 28 Sep 2012 17:33:18 +0000 (10:33 -0700)]
am
24dfc952: Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
* commit '
24dfc952bcb609f7ba59c7fb9f7c3004ffb8c83b':
Camera2: Re-entering preview state on v2 Device
Alex Ray [Fri, 28 Sep 2012 17:30:38 +0000 (10:30 -0700)]
Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev
Andreas Huber [Fri, 28 Sep 2012 17:23:51 +0000 (10:23 -0700)]
Various improvements to a cleaner shutdown of the wifi display connection.
Change-Id: Id029a89939e53c2bd1d20e572d3975ec2795c239
related-to-bug:
7247918
Alex Ray [Thu, 27 Sep 2012 23:06:48 +0000 (16:06 -0700)]
Camera2: Use new JPEG transport header
Check for new JPEG transport header at the end of the stream buffer
instead of at the beginning.
Bug:
7108816
Change-Id: I26c52267cb406dae50c9d0ee01e6c26359ba84aa
Eino-Ville Talvala [Fri, 28 Sep 2012 03:40:23 +0000 (20:40 -0700)]
am
d0cec0cb: Camera2: Only _some_ FPS values in the old API are scaled.
* commit '
d0cec0cb574a3d629afb7c32883bc986d7a65535':
Camera2: Only _some_ FPS values in the old API are scaled.
Eino-Ville Talvala [Fri, 28 Sep 2012 01:08:20 +0000 (18:08 -0700)]
Camera2: Only _some_ FPS values in the old API are scaled.
The (deprecated) single-FPS parameter is not scaled by 1000.
Bug:
7230239
Change-Id: I5664cce90f9cb01e57e39f1a1f7c8eb730501da3
Eino-Ville Talvala [Thu, 27 Sep 2012 23:38:09 +0000 (16:38 -0700)]
am
12d3e887: Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev
* commit '
12d3e887c6cefcd5ae0abce528ea576950ce6b9f':
Camera2: Fix FPS value scaling between HAL2 and API
Eino-Ville Talvala [Thu, 27 Sep 2012 23:36:15 +0000 (16:36 -0700)]
Merge "Camera2: Fix FPS value scaling between HAL2 and API" into jb-mr1-dev
Andreas Huber [Thu, 27 Sep 2012 21:33:48 +0000 (14:33 -0700)]
am
de799a74: wfd_presentation_url should not include the port number according to wfd specs
* commit '
de799a74064a363d26f4c1bbc5a59d1b7127f49f':
wfd_presentation_url should not include the port number according to wfd specs
Andreas Huber [Thu, 27 Sep 2012 21:32:22 +0000 (14:32 -0700)]
am
ecc8db5e: Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
* commit '
ecc8db5ee83d648532be1392f53277aa3a25284e':
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
Andreas Huber [Thu, 27 Sep 2012 21:32:21 +0000 (14:32 -0700)]
am
5cfd237f: Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
* commit '
5cfd237fd70572796b86f977ff4fdfe29cab888d':
Prepend SPS/PPS manually before encryption in HDCP mode. This is
Andreas Huber [Thu, 27 Sep 2012 21:27:42 +0000 (14:27 -0700)]
wfd_presentation_url should not include the port number according to wfd specs
Change-Id: I9c0e0174f6ab4cb24c6eafcaae853e432b3dffb9
related-to-bug:
7247490
Andreas Huber [Thu, 27 Sep 2012 21:31:04 +0000 (14:31 -0700)]
Merge "Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit." into jb-mr1-dev
Andreas Huber [Thu, 27 Sep 2012 21:30:49 +0000 (14:30 -0700)]
Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev
Andreas Huber [Thu, 27 Sep 2012 21:13:05 +0000 (14:13 -0700)]
Cleaner Wifi Display shutdown process, avoid crashing HDCP on exit.
Change-Id: Ie54ee3edd672ec629360b4ecc5df2f85ecbaa45f
related-to-bug:
7247584
Eino-Ville Talvala [Thu, 27 Sep 2012 21:18:13 +0000 (14:18 -0700)]
Camera2: Fix FPS value scaling between HAL2 and API
API assumes FPS values are in fixed-point with LSB 0.001; HAL2 just
uses ints with no fractional part.
HAL should probably use floats or something similar, but for now, fix
scaling so the two agree on FPS values.
Bug:
7230239
Change-Id: Ie18a4f11fc9d17d9ae2d04781511a273213eda55
Dave Burke [Thu, 27 Sep 2012 19:57:04 +0000 (12:57 -0700)]
am
f58cac48: Tune WFD audio bitrate (did some listening tests). Bug:
7241844
* commit '
f58cac48e5732dbc4a5f33eed9cd39f109146ca4':
Tune WFD audio bitrate (did some listening tests). Bug:
7241844
Dave Burke [Thu, 27 Sep 2012 19:54:57 +0000 (12:54 -0700)]
Tune WFD audio bitrate (did some listening tests).
Bug:
7241844
Change-Id: I5243f7a771871e650c6c2f380e0e81e7671c7bac
The Android Open Source Project [Thu, 27 Sep 2012 16:57:48 +0000 (09:57 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I140c6ef68bdb8fa5a2e4d1041405ba9f3c85097a
Andreas Huber [Thu, 27 Sep 2012 15:53:23 +0000 (08:53 -0700)]
Prepend SPS/PPS manually before encryption in HDCP mode. This is
a temporary change that will go away once the encoder can take care
of this.
Change-Id: Id65218f8a250d8c8fe3e8987b522065b5f5d7dca
related-to-bug:
7245308
The Android Automerger [Thu, 27 Sep 2012 13:59:33 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Alex Ray [Wed, 26 Sep 2012 22:52:50 +0000 (15:52 -0700)]
Camera2: Re-entering preview state on v2 Device
Bug:
7240891
Change-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae
Iliyan Malchev [Thu, 27 Sep 2012 03:24:18 +0000 (20:24 -0700)]
am
6d6a4d3f: Merge changes Ia4414241,I34f5d36a into jb-mr1-dev
* commit '
6d6a4d3f37b332284b8b976bd5bb21d29007a97e':
audioflinger: use resample coefficients from audio-resampler library.
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Iliyan Malchev [Thu, 27 Sep 2012 03:22:12 +0000 (20:22 -0700)]
Merge changes Ia4414241,I34f5d36a into jb-mr1-dev
* changes:
audioflinger: use resample coefficients from audio-resampler library.
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Dave Burke [Thu, 27 Sep 2012 02:12:56 +0000 (19:12 -0700)]
am
ee93c8c0: Tune iframe interval to 1sec. Bug:
7241844
* commit '
ee93c8c0f65cc1965ca09c9e33ae672f8bc9b88c':
Tune iframe interval to 1sec. Bug:
7241844
SathishKumar Mani [Tue, 17 Jan 2012 18:49:47 +0000 (10:49 -0800)]
audioflinger: use resample coefficients from audio-resampler library.
-Add a separate quality VERY_HIGH_QUALITY in resampler
-Use resample coefficients audio-resampler library for
quality VERY_HIGH_QUALITY.
-This improves the quality of resampled output.
Bug:
7024293
Change-Id: Ia44142413bed5f5963d7eab7846eec877a2415e4
Signed-off-by: Iliyan Malchev <malchev@google.com>
SathishKumar Mani [Mon, 24 Sep 2012 18:48:11 +0000 (11:48 -0700)]
audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler
Change-Id: I34f5d36ae60010ec64222d6660d10a84da3bf566
Bug:
7024293
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dave Burke [Thu, 27 Sep 2012 00:56:37 +0000 (17:56 -0700)]
Tune iframe interval to 1sec.
Bug:
7241844
Change-Id: Iae0d73ecc680f6fa69d82ee2e8fac18ebece7782
Andreas Huber [Wed, 26 Sep 2012 21:49:49 +0000 (14:49 -0700)]
am
72ff5903: 720p24 i-frames every 2 secs.
* commit '
72ff5903df5f409ea83f74c363a52f0745ced8b8':
720p24 i-frames every 2 secs.
Andreas Huber [Wed, 26 Sep 2012 21:30:33 +0000 (14:30 -0700)]
720p24 i-frames every 2 secs.
related-to-bug:
7239971
Change-Id: I4cbf7e9b878b180b0683656e9e8c0a6bb18e06dc
Andreas Huber [Wed, 26 Sep 2012 21:12:44 +0000 (14:12 -0700)]
am
5895c5db: Merge "Make sure we only release the HDCP module once shutdown has completed." into jb-mr1-dev
* commit '
5895c5db5caa6b1e3e415716269947755506859e':
Make sure we only release the HDCP module once shutdown has completed.
Andreas Huber [Wed, 26 Sep 2012 21:11:26 +0000 (14:11 -0700)]
Merge "Make sure we only release the HDCP module once shutdown has completed." into jb-mr1-dev
Andreas Huber [Wed, 26 Sep 2012 19:54:26 +0000 (12:54 -0700)]
Make sure we only release the HDCP module once shutdown has completed.
Change-Id: I4b614afe2b55ac53b4aa63311e5bea8fd6c4462e
related-to-bug:
7223555
Alex Ray [Wed, 26 Sep 2012 18:54:21 +0000 (11:54 -0700)]
am
eb8a42b9: Camera2: Fix JPEG Transport Header offset
* commit '
eb8a42b934f20a15f40d656e2bc90f384f1ccb10':
Camera2: Fix JPEG Transport Header offset
Alex Ray [Tue, 25 Sep 2012 19:37:14 +0000 (12:37 -0700)]
Camera2: Fix JPEG Transport Header offset
Use offset into start of buffer after transport header
Bug:
7108816
Change-Id: I6f9778db313856eaeee31f6999e4e55678b09b26
Andreas Huber [Wed, 26 Sep 2012 18:02:09 +0000 (11:02 -0700)]
am
44b175c3: Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
* commit '
44b175c31a96804d8f981c43145967473491540f':
Fix shutdown and eliminate those annoying "failed to post..." logs.
Andreas Huber [Wed, 26 Sep 2012 18:02:08 +0000 (11:02 -0700)]
am
6283af5f: Merge "Logic to include HDCP specific PES extra header data was backwards." into jb-mr1-dev
* commit '
6283af5f0a99bc7cba43bb9d09bd920b438f47c8':
Logic to include HDCP specific PES extra header data was backwards.
Andreas Huber [Wed, 26 Sep 2012 18:00:49 +0000 (11:00 -0700)]
Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." into jb-mr1-dev
Andreas Huber [Wed, 26 Sep 2012 18:00:10 +0000 (11:00 -0700)]
Merge "Logic to include HDCP specific PES extra header data was backwards." into jb-mr1-dev
Andreas Huber [Wed, 26 Sep 2012 17:19:18 +0000 (10:19 -0700)]
Logic to include HDCP specific PES extra header data was backwards.
Change-Id: I85ab02f0c3ab945093b27210da1e36a31c022da5
related-to-bug:
7237850
Andreas Huber [Wed, 26 Sep 2012 17:16:56 +0000 (10:16 -0700)]
Fix shutdown and eliminate those annoying "failed to post..." logs.
Change-Id: I963e0712f59070f83a26946c494fdeb3558aa0e3
related-to-bug:
7230886
Glenn Kasten [Wed, 26 Sep 2012 17:08:44 +0000 (10:08 -0700)]
am
842c5d95: Revert "Don\'t wait for presentation complete if terminated"
* commit '
842c5d9553f3f8e97d04ed1bd0d37e4851240654':
Revert "Don't wait for presentation complete if terminated"
The Android Open Source Project [Wed, 26 Sep 2012 16:06:36 +0000 (09:06 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: Ia30ecedfb569952d5aa125673ea4a749ef7f0144
Glenn Kasten [Wed, 26 Sep 2012 15:34:10 +0000 (08:34 -0700)]
Revert "Don't wait for presentation complete if terminated"
This reverts commit
44cda3a4e7ca3de0db9cb49145def3803b03ebb4
Change-Id: I7fd29b77690dab057ac966a42fb198b2772f092c
The Android Automerger [Wed, 26 Sep 2012 13:59:25 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Glenn Kasten [Wed, 26 Sep 2012 00:23:44 +0000 (17:23 -0700)]
am
cc0f1cfb: Implement android.media.AudioManager.getProperty()
* commit '
cc0f1cfb69ce8b8985fc2c0984847a06a13ad22d':
Implement android.media.AudioManager.getProperty()
Andreas Huber [Wed, 26 Sep 2012 00:23:43 +0000 (17:23 -0700)]
am
d9aa7b4d: Merge "Better transport stream timestamp handling." into jb-mr1-dev
* commit '
d9aa7b4db46bea5966401f9fcfbecb3269ec55c7':
Better transport stream timestamp handling.
Andreas Huber [Wed, 26 Sep 2012 00:23:43 +0000 (17:23 -0700)]
am
c910b7ac: Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev
* commit '
c910b7accbed385ce5905e800c16d92290ccd997':
Add some more logging, reduce startup delay to 1 sec.
Glenn Kasten [Mon, 24 Sep 2012 18:27:18 +0000 (11:27 -0700)]
Implement android.media.AudioManager.getProperty()
Bug:
6635041
Change-Id: I3386a4a6c226bc4eceaf65556119e4fb15f73224
Andreas Huber [Tue, 25 Sep 2012 23:16:06 +0000 (16:16 -0700)]
Merge "Better transport stream timestamp handling." into jb-mr1-dev
Andreas Huber [Tue, 25 Sep 2012 23:15:52 +0000 (16:15 -0700)]
Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-dev
Andreas Huber [Tue, 25 Sep 2012 21:20:08 +0000 (14:20 -0700)]
Better transport stream timestamp handling.
Properly emit PCR and PMT/PAT updates every 0.1 secs.
Don't stream RTCP unless requested by the dongle.
related-to-bug:
7232540
Change-Id: Ie9a6949a074d86ab022adfab5d2811294ba746aa
Eino-Ville Talvala [Tue, 25 Sep 2012 19:32:25 +0000 (12:32 -0700)]
am
c7d9afdc: Camera2: Make sure to clean out reprocess streams on shutdown as well.
* commit '
c7d9afdc7d2181aef7688638fff52859bcdabd65':
Camera2: Make sure to clean out reprocess streams on shutdown as well.
Eino-Ville Talvala [Tue, 25 Sep 2012 19:32:24 +0000 (12:32 -0700)]
am
4bb81188: Camera2: Debug and logging fixes.
* commit '
4bb8118816874c696d9f1adab48490df1da365f7':
Camera2: Debug and logging fixes.
Eric Laurent [Tue, 25 Sep 2012 19:28:36 +0000 (12:28 -0700)]
am
b6ba2fd0: audioflinger: improve record start and thread exit
* commit '
b6ba2fd0d61a4844c153e17843fbe2c841c4bf57':
audioflinger: improve record start and thread exit
Eino-Ville Talvala [Mon, 24 Sep 2012 20:44:07 +0000 (13:44 -0700)]
Camera2: Make sure to clean out reprocess streams on shutdown as well.
Otherwise, streams may persist past expected lifetime.
Bug:
6243944
Change-Id: I901971b78baf9d577ea3812588dec3885232e7ef
The Android Automerger [Tue, 25 Sep 2012 18:05:51 +0000 (11:05 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Mon, 24 Sep 2012 16:46:53 +0000 (09:46 -0700)]
Camera2: Debug and logging fixes.
- Fix LOG_TAGs to work with standard logcat filtering.
- Add ATRACE to Camera2Device
- Shorten thread names to fit in 16 characters
- Remove some ATRACEs to avoid flooding trace unnecessarily
Bug:
7220520
Change-Id: Ief8d677b5c8bb35d94e0f21b11b86505e83169ea
Eric Laurent [Mon, 24 Sep 2012 22:02:17 +0000 (15:02 -0700)]
audioflinger: improve record start and thread exit
Use broadcast() instead of signal() on the
thread wake up condition when starting record or requesting thread
exit to make sure that if another thread is waiting for the same
condition (e.g binder thread calling setParameters()) the mixer
thread will be woken up.
Bug
7184317.
Change-Id: I3154a4509ca7af6ffae5236e522b0fab8e75ed06
Andreas Huber [Mon, 24 Sep 2012 21:33:18 +0000 (14:33 -0700)]
Add some more logging, reduce startup delay to 1 sec.
Change-Id: Ic24a3d9e3e645288411efb46f7004d89e7a0a4b7
The Android Automerger [Tue, 25 Sep 2012 13:59:36 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Mon, 24 Sep 2012 23:46:03 +0000 (16:46 -0700)]
am
2a865ad8: Tune video bitrate to 5 mbps.
* commit '
2a865ad8d45940bc824c02a8a8558cbcb97acc88':
Tune video bitrate to 5 mbps.
Dave Burke [Mon, 24 Sep 2012 23:42:14 +0000 (16:42 -0700)]
Tune video bitrate to 5 mbps.
Change-Id: Ieb7ab1675db6fb21087a1258465f866ecdc5475b
Igor Murashkin [Mon, 24 Sep 2012 22:21:24 +0000 (15:21 -0700)]
am
9a2e4fa6: Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" into jb-mr1-dev
* commit '
9a2e4fa60c843df54f35923898975fdbd04bed56':
Camera2: Emit ShutterCallback/RawCallback events after takePicture
Igor Murashkin [Mon, 24 Sep 2012 22:21:23 +0000 (15:21 -0700)]
am
aae1de9e: Merge "Camera2: Fix cropRegion sometimes exceeding the sensor array size" into jb-mr1-dev
* commit '
aae1de9eaba5aa3e2bce68b59aa78f918020f5a8':
Camera2: Fix cropRegion sometimes exceeding the sensor array size
Igor Murashkin [Mon, 24 Sep 2012 22:19:04 +0000 (15:19 -0700)]
Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" into jb-mr1-dev
Igor Murashkin [Mon, 24 Sep 2012 22:18:41 +0000 (15:18 -0700)]
Merge "Camera2: Fix cropRegion sometimes exceeding the sensor array size" into jb-mr1-dev
Glenn Kasten [Mon, 24 Sep 2012 20:53:33 +0000 (13:53 -0700)]
am
8d452f1c: Merge "Check clock_gettime(CLOCK_MONOTONIC) for failure" into jb-mr1-dev
* commit '
8d452f1c61aa70c4a86c4114532f2c0983120ef8':
Check clock_gettime(CLOCK_MONOTONIC) for failure
Glenn Kasten [Mon, 24 Sep 2012 20:51:58 +0000 (13:51 -0700)]
Merge "Check clock_gettime(CLOCK_MONOTONIC) for failure" into jb-mr1-dev
Igor Murashkin [Thu, 20 Sep 2012 22:18:50 +0000 (15:18 -0700)]
Camera2: Emit ShutterCallback/RawCallback events after takePicture
Bug:
7176692
Change-Id: I50e8f9511f1770d97a42d1fa208c04b1bbcfba6b
Igor Murashkin [Wed, 19 Sep 2012 01:23:49 +0000 (18:23 -0700)]
Camera2: Fix cropRegion sometimes exceeding the sensor array size
Bug:
7155264
Bug:
7120431
Change-Id: I92a9c695b97ec40acf26dbdaa877964e41a9fd4c
Glenn Kasten [Mon, 24 Sep 2012 18:29:00 +0000 (11:29 -0700)]
Check clock_gettime(CLOCK_MONOTONIC) for failure
Bug:
7100774
Change-Id: I15a84a19bb6d6ef1d9dac4beaa03587638196404
Eric Laurent [Mon, 24 Sep 2012 17:39:59 +0000 (10:39 -0700)]
am
c0c3b298: Merge "fix end of track presentation on suspended output" into jb-mr1-dev
* commit '
c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e':
fix end of track presentation on suspended output
Eric Laurent [Mon, 24 Sep 2012 17:38:23 +0000 (10:38 -0700)]
Merge "fix end of track presentation on suspended output" into jb-mr1-dev
Alex Ray [Mon, 24 Sep 2012 17:35:29 +0000 (10:35 -0700)]
am
53787020: Merge "Camera2: Truncate JPEG images" into jb-mr1-dev
* commit '
53787020d2706a1ab04972213b586acaf757bd57':
Camera2: Truncate JPEG images
Alex Ray [Mon, 24 Sep 2012 17:33:32 +0000 (10:33 -0700)]
Merge "Camera2: Truncate JPEG images" into jb-mr1-dev
Andreas Huber [Mon, 24 Sep 2012 17:29:09 +0000 (10:29 -0700)]
am
ea4bbfdc: Attempt an orderly shutdown of the wifi display connection if possible.
* commit '
ea4bbfdcad9478ea19257fb19a32de68a2dfd958':
Attempt an orderly shutdown of the wifi display connection if possible.
The Android Open Source Project [Mon, 24 Sep 2012 17:12:05 +0000 (10:12 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I5428b18f029aa2d74cefe23e27eda2040d711778
Andreas Huber [Fri, 21 Sep 2012 23:02:39 +0000 (16:02 -0700)]
Attempt an orderly shutdown of the wifi display connection if possible.
Shutdown the session if the encoder signals an error.
related-to-bug:
7207481
Change-Id: Id78000a336f8bb8904e7d2102f8f81a4139cdd61
James Dong [Mon, 24 Sep 2012 16:26:16 +0000 (09:26 -0700)]
am
94a68ecf: Merge "Bug fix: MediaPlayer\'s deselectTrack() for subtitle." into jb-mr1-dev
* commit '
94a68ecf2b56bd56994d0352cbaad56e58dcf0dc':
Bug fix: MediaPlayer's deselectTrack() for subtitle.
Eino-Ville Talvala [Mon, 24 Sep 2012 16:26:15 +0000 (09:26 -0700)]
am
df2bc296: Merge "Camera2: Don\'t use ZSL when flash is on force fire mode." into jb-mr1-dev
* commit '
df2bc29664d3bf80bed0012970608e5605acf7af':
Camera2: Don't use ZSL when flash is on force fire mode.
Alex Ray [Fri, 21 Sep 2012 07:58:03 +0000 (00:58 -0700)]
Camera2: Truncate JPEG images
Check for JPEG size hint from HAL, use if applicable. Otherwise
read until end of JPEG image to find appropriate file size.
Bug:
7108816
Change-Id: Idfd194133eb6c293ab08c9466f59606e62ba56b6
The Android Automerger [Mon, 24 Sep 2012 01:59:44 +0000 (18:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Sun, 23 Sep 2012 22:20:50 +0000 (15:20 -0700)]
fix end of track presentation on suspended output
The code detecting the end of an audio track presentation before
removing it from the active track list is based on the
count of audio frames sent to audio HAL. When an output stream
is suspended (e.g. A2DP when SCO is active), this count does not
change and a track in stopped state will never be removed from
active track list causing the mixer thread to never release
the wake lock.
The fix consists in incrementing the audio HAL frame count even
if the output is suspended.
Also fix a problem in getRenderPosition() when the output is suspended.
Bug
7167534.
Change-Id: I3be836cbbea29b65dc087199cac6a1cd84c0a41d
James Dong [Sun, 23 Sep 2012 17:01:19 +0000 (10:01 -0700)]
Merge "Bug fix: MediaPlayer's deselectTrack() for subtitle." into jb-mr1-dev
The Android Automerger [Sat, 22 Sep 2012 16:41:41 +0000 (09:41 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Sat, 22 Sep 2012 01:34:43 +0000 (18:34 -0700)]
Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-dev
Eino-Ville Talvala [Fri, 21 Sep 2012 23:30:42 +0000 (16:30 -0700)]
Camera2: Don't use ZSL when flash is on force fire mode.
Bug:
7213907
Change-Id: I120b187c1886d85f4b2b5d3a6f28a28936424e8e
Igor Murashkin [Fri, 21 Sep 2012 22:13:30 +0000 (15:13 -0700)]
am
75dce94a: Merge "Camera2: Emit FaceDetection events for all except repeating 0-face frames" into jb-mr1-dev
* commit '
75dce94aca6203ada887b6c2d6a8a8130cdbfaca':
Camera2: Emit FaceDetection events for all except repeating 0-face frames
Igor Murashkin [Fri, 21 Sep 2012 22:11:55 +0000 (15:11 -0700)]
Merge "Camera2: Emit FaceDetection events for all except repeating 0-face frames" into jb-mr1-dev
Igor Murashkin [Thu, 20 Sep 2012 23:27:54 +0000 (16:27 -0700)]
Camera2: Emit FaceDetection events for all except repeating 0-face frames
Bug:
7205311
Change-Id: I570209445acf3a26f2246c3fe886d56bb63bd2f8
Andreas Huber [Fri, 21 Sep 2012 16:29:07 +0000 (09:29 -0700)]
am
207e1854: Remove legacy code and APIs in wifi display related code.
* commit '
207e18540fefbaf530a4fdf506d266f34ddec84f':
Remove legacy code and APIs in wifi display related code.