OSDN Git Service
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.
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
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.
Andreas Huber [Thu, 20 Sep 2012 23:00:17 +0000 (16:00 -0700)]
Remove legacy code and APIs in wifi display related code.
Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
The Android Automerger [Fri, 21 Sep 2012 13:59:33 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Fri, 21 Sep 2012 03:24:16 +0000 (20:24 -0700)]
am
086f958a: Tune video bitrate to 2.5 MBPS.
* commit '
086f958a7e539acffb637b42f5a6998184544179':
Tune video bitrate to 2.5 MBPS.
Jeff Tinker [Fri, 21 Sep 2012 03:23:01 +0000 (20:23 -0700)]
am
437aa4c5: Merge "Allow DRM client to pass the FD of an open file to the DRM server." into jb-mr1-dev
* commit '
437aa4c55fc010d738e7c3572778a2073590f30d':
Allow DRM client to pass the FD of an open file to the DRM server.
Dave Burke [Fri, 21 Sep 2012 03:12:52 +0000 (20:12 -0700)]
Tune video bitrate to 2.5 MBPS.
Temporary workaround for buggy firmware (desired is 5 MBPS).
Change-Id: I9fb0af31ca07c9bfdc6f790b7c98ca546eaf2985
Eino-Ville Talvala [Thu, 20 Sep 2012 21:44:20 +0000 (14:44 -0700)]
Camera2: Clean up startup/shutdown sequences.
- Close camera device on startup errors
- Make sure all threads are shut down and the device is closed before
returning from ICamera::disconnect.
Bug:
7172680
Change-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988
Jeff Tinker [Fri, 21 Sep 2012 00:11:52 +0000 (17:11 -0700)]
Merge "Allow DRM client to pass the FD of an open file to the DRM server." into jb-mr1-dev
Andreas Huber [Thu, 20 Sep 2012 22:26:44 +0000 (15:26 -0700)]
am
8a6f0b1f: Merge "Code to support RTP retransmission according to rfc4585, rfc4588" into jb-mr1-dev
* commit '
8a6f0b1f6d91bbe9d2b2f732d731e5ccc741041e':
Code to support RTP retransmission according to rfc4585, rfc4588
Andreas Huber [Thu, 20 Sep 2012 22:25:21 +0000 (15:25 -0700)]
Merge "Code to support RTP retransmission according to rfc4585, rfc4588" into jb-mr1-dev
Eino-Ville Talvala [Thu, 20 Sep 2012 22:15:26 +0000 (15:15 -0700)]
am
75041228: Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-dev
* commit '
75041228626439668b64c93eb7bb866b3f63c3fd':
Camera2: Clean up startup/shutdown sequences.
Eino-Ville Talvala [Thu, 20 Sep 2012 22:15:25 +0000 (15:15 -0700)]
am
4386b7c4: Merge "Camera2: Erase ZSL queue after each use." into jb-mr1-dev
* commit '
4386b7c4b0f24aa634c0e33f69565bbaa1b2e072':
Camera2: Erase ZSL queue after each use.
Eino-Ville Talvala [Thu, 20 Sep 2012 22:12:56 +0000 (15:12 -0700)]
Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-dev
Eino-Ville Talvala [Thu, 20 Sep 2012 22:12:24 +0000 (15:12 -0700)]
Merge "Camera2: Erase ZSL queue after each use." into jb-mr1-dev
Eino-Ville Talvala [Thu, 20 Sep 2012 21:44:20 +0000 (14:44 -0700)]
Camera2: Clean up startup/shutdown sequences.
- Close camera device on startup errors
- Make sure all threads are shut down and the device is closed before
returning from ICamera::disconnect.
Bug:
7172680
Change-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988
Andreas Huber [Thu, 20 Sep 2012 20:09:22 +0000 (13:09 -0700)]
Code to support RTP retransmission according to rfc4585, rfc4588
Change-Id: Idfb3c0935f28e4cbc2141f0903f0d3c4e95818a6
Eino-Ville Talvala [Thu, 20 Sep 2012 19:51:06 +0000 (12:51 -0700)]
am
aa05a277: Merge "Camera2: State must be STOPPED before JPEG callback is fired." into jb-mr1-dev
* commit '
aa05a277e317ff224229c741bb97a6351d3c17db':
Camera2: State must be STOPPED before JPEG callback is fired.
Gene Morgan [Fri, 14 Sep 2012 20:35:39 +0000 (13:35 -0700)]
Allow DRM client to pass the FD of an open file to the DRM server.
Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/
This modifies the marshall/unmarshall of IDrmManagerService::
acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey".
If tag is present convert string to binary FD, then back to string
after passage through the interface's Binder.
Relevant bug reports:
bug:
6426185
Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
The Android Open Source Project [Thu, 20 Sep 2012 17:35:42 +0000 (10:35 -0700)]
Reconcile with jb-mr1-release - do not merge
Change-Id: I85bcd80a77b96e529e1ce20b36e56398b86e73a7
Eino-Ville Talvala [Thu, 20 Sep 2012 17:34:48 +0000 (10:34 -0700)]
Merge "Camera2: State must be STOPPED before JPEG callback is fired." into jb-mr1-dev
Eino-Ville Talvala [Thu, 20 Sep 2012 00:11:04 +0000 (17:11 -0700)]
Camera2: Erase ZSL queue after each use.
Since preview stops after a capture is submitted, need to clear out
the ZSL queue to avoid using stale buffers when the preview starts up
again.
Bug:
7189765
Change-Id: I9ae2382d0af132208aca5ccba49b5464d18a263e
Andreas Huber [Thu, 20 Sep 2012 16:42:36 +0000 (09:42 -0700)]
am
2761d21c: Merge "Instantiate HDCP module, add PES_private_data for encrypted streams." into jb-mr1-dev
* commit '
2761d21cf6ce4c0de63f5d9cbd920c57c7b2b213':
Instantiate HDCP module, add PES_private_data for encrypted streams.
Andreas Huber [Thu, 20 Sep 2012 16:42:35 +0000 (09:42 -0700)]
am
b88516c4: Merge "HDCP module binderized" into jb-mr1-dev
* commit '
b88516c4c0695c4b9ea2feccd3aafef654da62bd':
HDCP module binderized
Andreas Huber [Thu, 20 Sep 2012 16:30:25 +0000 (09:30 -0700)]
Merge "Instantiate HDCP module, add PES_private_data for encrypted streams." into jb-mr1-dev
Andreas Huber [Thu, 20 Sep 2012 16:30:11 +0000 (09:30 -0700)]
Merge "HDCP module binderized" into jb-mr1-dev
Eino-Ville Talvala [Thu, 20 Sep 2012 00:09:15 +0000 (17:09 -0700)]
Camera2: State must be STOPPED before JPEG callback is fired.
Move handling of JPEG callback to CaptureSequencer instead of
JpegProcessor, so that we can be sure the camera state is updated to
STOPPED before the JPEG callback is sent to the application layer.
Bug:
7172743
Change-Id: Ie8752d946d3eb8254230c77f10e5c38a83dc5371
Eino-Ville Talvala [Thu, 20 Sep 2012 16:11:25 +0000 (09:11 -0700)]
am
da1c5c15: Camera2: ZSL captures should also make some noise.
* commit '
da1c5c15c2483cd41035e1a492c5963ac86bbcf5':
Camera2: ZSL captures should also make some noise.
Eino-Ville Talvala [Thu, 20 Sep 2012 16:11:24 +0000 (09:11 -0700)]
am
c5531186: Camera2: Increase max timeout for the precapture sequence.
* commit '
c55311869f1853c6814c9bcda8a4b60e43091c1a':
Camera2: Increase max timeout for the precapture sequence.
Insun Kang [Thu, 20 Sep 2012 12:03:44 +0000 (21:03 +0900)]
Bug fix: MediaPlayer's deselectTrack() for subtitle.
o Previously, deselectTrack() actually doesn't work properly in
TimedTextDriver / TimedTextPlayer.
o Ignores select track operation when the same track is selected in a
row.
Bug:
7200096
TESTED=runtest -d cts-media -c android.media.cts.MediaPlayerTest
Change-Id: If7feac294cf9b358f616be45574bc2e26001c887
Eino-Ville Talvala [Thu, 20 Sep 2012 00:12:50 +0000 (17:12 -0700)]
Camera2: ZSL captures should also make some noise.
Change-Id: If7aff7223db41b4b7edeeb4c32e40ef3197b180b
Eino-Ville Talvala [Wed, 19 Sep 2012 23:12:18 +0000 (16:12 -0700)]
Camera2: Increase max timeout for the precapture sequence.
Increase maximum duration of the precapture sequence (final metering +
preflash + redeye reduction) to 2 seconds before timing out.
Change-Id: Ie1de4e96d46599eb53e1def9052b211e684f1fbc
Andreas Huber [Tue, 18 Sep 2012 21:47:48 +0000 (14:47 -0700)]
Instantiate HDCP module, add PES_private_data for encrypted streams.
Change-Id: I970f561a56a1d489a392c3480dec13f4ed7b43bd
Andreas Huber [Tue, 18 Sep 2012 17:36:32 +0000 (10:36 -0700)]
HDCP module binderized
Change-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6
The Android Automerger [Wed, 19 Sep 2012 14:01:35 +0000 (07:01 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Wed, 19 Sep 2012 01:04:00 +0000 (18:04 -0700)]
am
74e58c55: Merge "Camera2: Increase capture timeout." into jb-mr1-dev
* commit '
74e58c55bc5259b957a51f1bb44a5911ad1f8400':
Camera2: Increase capture timeout.
Eino-Ville Talvala [Wed, 19 Sep 2012 00:58:26 +0000 (17:58 -0700)]
Merge "Camera2: Increase capture timeout." into jb-mr1-dev
Eino-Ville Talvala [Tue, 18 Sep 2012 23:01:11 +0000 (16:01 -0700)]
Camera2: Increase capture timeout.
Low-light modes may take longer to capture a picture, so increase the
timeouts.
Change-Id: Id50b1e4fd3186da4e75b2cc1c226ced2f8d394ac
Eino-Ville Talvala [Tue, 18 Sep 2012 20:48:33 +0000 (13:48 -0700)]
am
2f93127d: Camera2: Enable ZSL by default.
* commit '
2f93127de30bbe17707ca8923c486d4494ffda37':
Camera2: Enable ZSL by default.
Eino-Ville Talvala [Tue, 18 Sep 2012 20:48:32 +0000 (13:48 -0700)]
am
9c6ec821: Merge "Camera2: ZSL: Do regular capture if AE is not satisfied." into jb-mr1-dev
* commit '
9c6ec8213d8da486a61659b9c37b7a57a2c4bb1a':
Camera2: ZSL: Do regular capture if AE is not satisfied.
Eino-Ville Talvala [Mon, 17 Sep 2012 23:57:27 +0000 (16:57 -0700)]
Camera2: Enable ZSL by default.
Bug:
6910087
Change-Id: Ie774f28fbb943b2ac2c856872fd4cae68b40430c
Eino-Ville Talvala [Tue, 18 Sep 2012 20:34:31 +0000 (13:34 -0700)]
Merge "Camera2: ZSL: Do regular capture if AE is not satisfied." into jb-mr1-dev
Eric Laurent [Tue, 18 Sep 2012 19:15:30 +0000 (12:15 -0700)]
am
fe5054c9: Merge "Fix THD with max user EQ preset volume again" into jb-mr1-dev
* commit '
fe5054c9cba7471c8580fe485ec5aaf12df459e8':
Fix THD with max user EQ preset volume again
Eric Laurent [Tue, 18 Sep 2012 19:11:17 +0000 (12:11 -0700)]
Merge "Fix THD with max user EQ preset volume again" into jb-mr1-dev
Eino-Ville Talvala [Tue, 18 Sep 2012 00:55:07 +0000 (17:55 -0700)]
Camera2: ZSL: Do regular capture if AE is not satisfied.
- Check the AE state of the selected ZSL buffer; if it's not reporting
as CONVERGED or LOCKED, fall back to normal capture sequence
- Add more debugging for the ZSL queue.
Bug:
6910087
Change-Id: I77a4287580aa9ddbd58438477c40ce829555d0ca
Eino-Ville Talvala [Tue, 18 Sep 2012 17:31:55 +0000 (10:31 -0700)]
am
0d61a788: Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev
* commit '
0d61a78845d716411e7b94914ae29639a5710fd2':
Camera2: Don't be bothered by lack of faces.
Camera2: Filter out faces with 0 confidence.
Camera2: Change face detect/scene mode priority.
Eino-Ville Talvala [Tue, 18 Sep 2012 17:28:35 +0000 (10:28 -0700)]
Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev
* changes:
Camera2: Don't be bothered by lack of faces.
Camera2: Filter out faces with 0 confidence.
Camera2: Change face detect/scene mode priority.
The Android Automerger [Tue, 18 Sep 2012 13:59:35 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eric Laurent [Mon, 17 Sep 2012 16:02:23 +0000 (09:02 -0700)]
Fix THD with max user EQ preset volume again
There was a problem with previous fix in
1b6c677c where
the THD was good for max volume but bad for intermediate
high volume values.
This fix does not limit the band gains but apply a correction
to the effect bundle volume to take into account not only the
maximum band gain but also the average band gains weighted
by the proximity of each band to the max gain band.
Change-Id: Ibedd8da7fce1e163117f29b3da332da0e4fe8889
Eino-Ville Talvala [Tue, 18 Sep 2012 01:25:29 +0000 (18:25 -0700)]
Camera2: Don't be bothered by lack of faces.
Sometimes, people might want to photograph scenes with no faces. And
not have their log fill with errors when they do.
Bug:
7078231
Change-Id: Ibe5c08d51b49a3ea14203416fe7803a58de08dda
Eino-Ville Talvala [Tue, 18 Sep 2012 01:07:20 +0000 (18:07 -0700)]
Camera2: Filter out faces with 0 confidence.
Bug:
7078231
Change-Id: I559f1281359835e0489456091a5409ebc8f73479
Eino-Ville Talvala [Mon, 17 Sep 2012 23:43:14 +0000 (16:43 -0700)]
Camera2: Change face detect/scene mode priority.
Explicit scene modes should override the implicit face priority scene
mode from enabling face detection, to match application/API
expectations.
Change-Id: I6f0f44fadeacfdc0594dd2fdc280e294d2d87df6
Andreas Huber [Mon, 17 Sep 2012 22:29:22 +0000 (15:29 -0700)]
am
c92bed3a: Now we only support a single client connection
* commit '
c92bed3a73c06e90217f8f199ca0b517aa7595d2':
Now we only support a single client connection
Andreas Huber [Mon, 17 Sep 2012 22:07:30 +0000 (15:07 -0700)]
Now we only support a single client connection
and it cannot be initiated from the local interface address for security
reasons.
Also, there's at most one playback session active at any time, and when
it dies we shutdown the client connection altogether and signal an error
to the listener.
related-to-bug:
7139784
Change-Id: Ia8d02bc994ce9986936947ddda1f2a3dddbf5714
Andreas Huber [Mon, 17 Sep 2012 18:24:57 +0000 (11:24 -0700)]
am
bd08e2f9: Support for RTP/RTCP traffic over TCP sockets in wifi display code.
* commit '
bd08e2f93bafd02abf2c25d740e9fb8bce455a99':
Support for RTP/RTCP traffic over TCP sockets in wifi display code.
Andreas Huber [Thu, 13 Sep 2012 18:25:33 +0000 (11:25 -0700)]
Support for RTP/RTCP traffic over TCP sockets in wifi display code.
This is opt-in through
adb shell setprop media.wfd.enable-tcp true
Change-Id: I49ab22a8c8d62690065631e781a7f0057e5ce557
Eino-Ville Talvala [Mon, 17 Sep 2012 15:38:48 +0000 (08:38 -0700)]
am
874a4618: Merge "Camera2: Don\'t play shutter sound when doing a video snapshot" into jb-mr1-dev
* commit '
874a4618b645ab5c1faaa738a871f52492f28de3':
Camera2: Don't play shutter sound when doing a video snapshot
Eino-Ville Talvala [Mon, 17 Sep 2012 15:37:25 +0000 (08:37 -0700)]
Merge "Camera2: Don't play shutter sound when doing a video snapshot" into jb-mr1-dev
The Android Automerger [Mon, 17 Sep 2012 00:12:14 +0000 (17:12 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
James Dong [Sun, 16 Sep 2012 17:35:45 +0000 (10:35 -0700)]
am
376074ed: Fixed a native crash due to deref of a NULL pointer
* commit '
376074ed1c3c368aeb336954a07632cd806288e2':
Fixed a native crash due to deref of a NULL pointer
Eino-Ville Talvala [Sat, 15 Sep 2012 20:27:52 +0000 (13:27 -0700)]
Camera2: Don't play shutter sound when doing a video snapshot
Bug:
7171820
Change-Id: I11ec0900aff3cdf4b57ae1bfc75f7acfecf95098
James Dong [Fri, 14 Sep 2012 22:34:35 +0000 (15:34 -0700)]
Fixed a native crash due to deref of a NULL pointer
We only checked the mNativeWindow against NULL, but did not check the native window object itself against NULL.
o related-to-bug:
7153683
Change-Id: I430d344dc09a2fc337bf51001551627056713773
The Android Automerger [Fri, 14 Sep 2012 21:10:20 +0000 (14:10 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Eino-Ville Talvala [Fri, 14 Sep 2012 19:11:33 +0000 (12:11 -0700)]
am
b845c6b0: Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev
* commit '
b845c6b0c3066d6791973be830f0953477461a65':
Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
Eino-Ville Talvala [Fri, 14 Sep 2012 19:10:07 +0000 (12:10 -0700)]
Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""" into jb-mr1-dev
Eino-Ville Talvala [Fri, 14 Sep 2012 18:37:13 +0000 (11:37 -0700)]
Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.""
The changes this commit depends on are now submitted.
This reverts commit
f54b1459cda7f585b4896671643b33bab8290964
Change-Id: If7f146ab7968d50fffd2174c2c5792bdc9d7724c
Eino-Ville Talvala [Fri, 14 Sep 2012 18:20:03 +0000 (11:20 -0700)]
am
e44e90c8: Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."" into jb-mr1-dev
* commit '
e44e90c82d75b806e89f751a61dc7e54d0144338':
Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."
Eino-Ville Talvala [Fri, 14 Sep 2012 18:17:32 +0000 (11:17 -0700)]
Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."" into jb-mr1-dev
James Dong [Fri, 14 Sep 2012 18:17:30 +0000 (11:17 -0700)]
am
dcd76da5: Merge "Make a small correction in terms of GOP structure in the recorded video" into jb-mr1-dev
* commit '
dcd76da55f1f8a77dec07bb7e080ed3488f2ae83':
Make a small correction in terms of GOP structure in the recorded video
Igor Murashkin [Fri, 14 Sep 2012 18:16:11 +0000 (11:16 -0700)]
Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."
This reverts commit
8a3016613dc684a6be11fdf643f9cc5cad817e8f
Change-Id: I3f1d4e9c13df838b8b6aa5696a6494140eac3e04
Igor Murashkin [Fri, 14 Sep 2012 18:16:03 +0000 (11:16 -0700)]
am
cb66d22f: Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into jb-mr1-dev
* commit '
cb66d22f2e3727ca858bb578c1d18956da1a9c2b':
Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.
James Dong [Fri, 14 Sep 2012 18:15:44 +0000 (11:15 -0700)]
Merge "Make a small correction in terms of GOP structure in the recorded video" into jb-mr1-dev
Igor Murashkin [Fri, 14 Sep 2012 18:14:29 +0000 (11:14 -0700)]
Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into jb-mr1-dev
James Dong [Fri, 14 Sep 2012 17:36:53 +0000 (10:36 -0700)]
Make a small correction in terms of GOP structure in the recorded video
When we have a 30 fps frame rate, and one second key-frame or I-frame interval,
we really would like to have for each second, 29 P-frames + 1 I-frame. Thus,
we should calculate the number of P frames so that it is equal to
frame_rate * I_frame_interval - 1
Change-Id: I5b9be6e4c101e7a6b718015aa4041496961c0f19
James Dong [Fri, 14 Sep 2012 17:07:35 +0000 (10:07 -0700)]
am
2637cb17: Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
* commit '
2637cb172105939052d8a02f4eea693a90549518':
Allow OMXCodec to specify an output color format for OMX decoder component
James Dong [Fri, 14 Sep 2012 17:05:51 +0000 (10:05 -0700)]
Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
The Android Automerger [Fri, 14 Sep 2012 14:11:39 +0000 (07:11 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Dave Burke [Fri, 14 Sep 2012 02:02:38 +0000 (19:02 -0700)]
am
d8421c54: Merge "Support IDR requests in wifi display, MediaCodec and ACodec." into jb-mr1-dev
* commit '
d8421c54dc00d637e41689004edcb06caaa40b62':
Support IDR requests in wifi display, MediaCodec and ACodec.
Dave Burke [Fri, 14 Sep 2012 02:00:26 +0000 (19:00 -0700)]
Merge "Support IDR requests in wifi display, MediaCodec and ACodec." into jb-mr1-dev
Eric Laurent [Fri, 14 Sep 2012 00:07:46 +0000 (17:07 -0700)]
am
896adcd3: audioflinger: send priority request from a thread
* commit '
896adcd3ae6a1c7010e526327eff54e16179987b':
audioflinger: send priority request from a thread
Eric Laurent [Thu, 13 Sep 2012 18:18:23 +0000 (11:18 -0700)]
audioflinger: send priority request from a thread
When creating a fast AudioTrack, a request is sent to SchedulingPolicyService
to elevate the requesting thread priority. This generates a binder
call into system_server process and to a JAVA service via JNI.
If the thread from which the track was created is in the system_server
process and does not have the "can call java" attribute, a crash occurs because
the binder optimization reuses the same thread to process the returning binder
call and no JNI env is present.
The fix consists in sending the priority change request from the AudioFlinger
mixer thread, not from the binder thread.
This also reverts the workaround in commit
73431968
Bug
7126707.
Change-Id: I3347adf71ffbb56ed8436506d4357eab693078a3
Andreas Huber [Thu, 13 Sep 2012 23:43:51 +0000 (16:43 -0700)]
Support IDR requests in wifi display, MediaCodec and ACodec.
Change-Id: I596cf8dd61b63465437f78413186fad2be287244
Eino-Ville Talvala [Thu, 13 Sep 2012 23:29:45 +0000 (16:29 -0700)]
Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.
Until all HAL implementations move to the new format negotiation
scheme, use CAMERA2_HAL_PIXEL_FORMAT_ZSL to indicate ZSL mode.
Bug:
6243944
Change-Id: Idf5d9f42e203903ba906d5df156100646b27404c
Jean-Michel Trivi [Thu, 13 Sep 2012 23:32:30 +0000 (16:32 -0700)]
am
4362f530: Handle audio HAL returning 0 bytes in record thread
* commit '
4362f5300162ed55f56cf167eccf7f2e5b89d435':
Handle audio HAL returning 0 bytes in record thread
Andreas Huber [Wed, 12 Sep 2012 23:48:23 +0000 (16:48 -0700)]
Better video bandwidth utilization by not lying about the frame rate.
log network bandwidth used (for data traffic).
Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
Andreas Huber [Wed, 12 Sep 2012 23:25:14 +0000 (16:25 -0700)]
Various improvements to cleanly shutdown a wfd session.
Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
Andreas Huber [Wed, 12 Sep 2012 21:06:17 +0000 (14:06 -0700)]
Audio and video bitrate are now configurable through system properties
adb shell setprop media.wfd.audio-bitrate 64000
adb shell setprop media.wfd.video-bitrate
10000000
are the defaults.
Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
Andreas Huber [Wed, 12 Sep 2012 19:15:18 +0000 (12:15 -0700)]
Use proper number of video buffers to be acquired simultaneously from
SurfaceMediaSource, this should match the number of encoder input buffers.
Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0