OSDN Git Service
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
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: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 [Thu, 20 Sep 2012 23:00:17 +0000 (16:00 -0700)]
Remove legacy code and APIs in wifi display related code.
Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
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
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: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: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
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
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: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
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
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 [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: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: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.
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: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 [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:37:25 +0000 (08:37 -0700)]
Merge "Camera2: Don't play shutter sound when doing a video snapshot" into jb-mr1-dev
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
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:17:32 +0000 (11:17 -0700)]
Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."" into jb-mr1-dev
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
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:05:51 +0000 (10:05 -0700)]
Merge "Allow OMXCodec to specify an output color format for OMX decoder component" into jb-mr1-dev
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 [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 18:44:00 +0000 (11:44 -0700)]
Handle audio HAL returning 0 bytes in record thread
Enter standby when HAL returns an error, but also consider 0 bytes
returned as NOT_ENOUGH_DATA.
Change-Id: Ica83142310e9c176f936e0440571a6034cbc575f
Jean-Michel Trivi [Thu, 13 Sep 2012 17:23:34 +0000 (10:23 -0700)]
Merge "Workaround for track recreation bug" into jb-mr1-dev
Eric Laurent [Thu, 13 Sep 2012 16:37:38 +0000 (09:37 -0700)]
Merge "Don't deadlock on AudioRecord start when reads return 0" into jb-mr1-dev
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 [Thu, 13 Sep 2012 16:26:34 +0000 (09:26 -0700)]
Merge "Audio and video bitrate are now configurable through system properties" into jb-mr1-dev
Andreas Huber [Thu, 13 Sep 2012 16:26:19 +0000 (09:26 -0700)]
Merge "Use proper number of video buffers to be acquired simultaneously from" into jb-mr1-dev
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
Andreas Huber [Wed, 12 Sep 2012 19:08:55 +0000 (12:08 -0700)]
Throttle SurfaceMediaSource.
Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
Jean-Michel Trivi [Thu, 13 Sep 2012 02:42:34 +0000 (19:42 -0700)]
Workaround for track recreation bug
Ignore thread can call Java parameter to work around bug where
AudioTrack instance gets recreated when key clicks are enabled
and WFD gets turned on, with the wrong parameters.
Change-Id: Ia42c8704b46fe3ffea560b05b60939fa2e4b29e1
Jean-Michel Trivi [Thu, 13 Sep 2012 01:48:33 +0000 (18:48 -0700)]
Don't deadlock on AudioRecord start when reads return 0
When calling start() on an AudioRecord with a HAL that
returns 0 on a read() operation, the start blocking
condition was never unblocked.
Add a boolean to track the first read operation so the returned
number of bytes (mBytesRead) is only evaluated after that
first read.
Change-Id: I8c735a00d48cd6a0da467ccdf75d3616b38f6afa
Eino-Ville Talvala [Wed, 12 Sep 2012 17:42:10 +0000 (10:42 -0700)]
Camera2: Fix ZSL bugs.
The ZSL processor was discarding buffers too often, and waiting for
new buffers with mutexes held.
Also adds basic fallback to regular capture in case the ZSL queue
doesn't contain a suitable buffer.
Bug:
7147043
Change-Id: I5721267ef08dbc87ef9d8ec47f333db5f67e41c1
Jean-Baptiste Queru [Wed, 12 Sep 2012 22:42:30 +0000 (15:42 -0700)]
am
a923dd4e: am
1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '
a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Jean-Baptiste Queru [Wed, 12 Sep 2012 22:26:28 +0000 (15:26 -0700)]
am
1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
* commit '
1b0ae9e47273357e19a9beb22466319753e8242d':
avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
Jean-Baptiste Queru [Wed, 12 Sep 2012 21:24:19 +0000 (14:24 -0700)]
Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"
Andreas Huber [Wed, 12 Sep 2012 17:54:33 +0000 (10:54 -0700)]
Merge "Various improvements to the wifi display implementation." into jb-mr1-dev
Andreas Huber [Wed, 12 Sep 2012 17:19:54 +0000 (10:19 -0700)]
Various improvements to the wifi display implementation.
Using a MediaPuller now, audio and video on their separate threads.
No more flushing the RTP stream on audio tracks, since it wastes too much
of a full size UDP packet.
Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
Elliott Hughes [Wed, 12 Sep 2012 15:59:26 +0000 (08:59 -0700)]
am
fd07d616: am
fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit '
fd07d61614e4b358349d1d46a32f9477784404c4':
Don't include <linux/socket.h> directly.
Elliott Hughes [Wed, 12 Sep 2012 15:55:32 +0000 (08:55 -0700)]
am
fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
* commit '
fbe1cc92d9e8930700c15f68717dd66fc1523177':
Don't include <linux/socket.h> directly.
Elliott Hughes [Wed, 12 Sep 2012 15:50:35 +0000 (08:50 -0700)]
Merge "Don't include <linux/socket.h> directly."
Elliott Hughes [Wed, 12 Sep 2012 01:47:53 +0000 (18:47 -0700)]
Don't include <linux/socket.h> directly.
In newer versions of Linux, stuff you need isn't in that file any more.
Change-Id: I62923ed2d92a75ff3182ba2ae27578ce7bde8356
Eino-Ville Talvala [Wed, 12 Sep 2012 01:25:27 +0000 (18:25 -0700)]
Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-dev
Eino-Ville Talvala [Wed, 12 Sep 2012 01:25:17 +0000 (18:25 -0700)]
Merge "Camera2: Configure ZSL at the right time." into jb-mr1-dev
Edwin Wong [Wed, 12 Sep 2012 00:52:59 +0000 (17:52 -0700)]
Merge "Add getError and setError to propagate error code from WVMMediaExtractor up to player." into jb-mr1-dev
Eino-Ville Talvala [Wed, 12 Sep 2012 00:23:48 +0000 (17:23 -0700)]
Camera2: Use full pixel array for ZSL stream
For efficiency, use full pixel array size for the ZSL output/input
streams, instead of the final picture size.
Bug:
7139362
Change-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3
Eino-Ville Talvala [Tue, 11 Sep 2012 23:51:32 +0000 (16:51 -0700)]
Camera2: Configure ZSL at the right time.
ZSL enable was too early in the camera startup sequence, resulting it
being turned off most of the time.
Bug:
7148012
Change-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772
Eino-Ville Talvala [Tue, 11 Sep 2012 18:37:17 +0000 (11:37 -0700)]
Merge "Camera1: Fix enable shutter sound command error handling." into jb-mr1-dev
Eino-Ville Talvala [Tue, 11 Sep 2012 18:01:18 +0000 (11:01 -0700)]
Camera1: Fix enable shutter sound command error handling.
Return the error codes from calls to enableShutterSound to the caller,
and don't call the HAL with the enable shutter sound command.
Change-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5
Eino-Ville Talvala [Tue, 11 Sep 2012 18:20:19 +0000 (11:20 -0700)]
Merge "Camera: Add HDR scene mode constants." into jb-mr1-dev
Edwin Wong [Thu, 6 Sep 2012 21:07:37 +0000 (14:07 -0700)]
Add getError and setError to propagate error code from WVMMediaExtractor up to player.
The two virtual functions provides a path for the player(AwesomePlayer) to retrieve
the last error from WVMMediaExtractor container.
Change-Id: Iee8d4a3eccf82af95eb3d4d465f069daced4aa1a
related-to-bug:
7073630
Jean-Michel Trivi [Tue, 11 Sep 2012 17:33:28 +0000 (10:33 -0700)]
Merge "Communicate audio session ID to downmixer" into jb-mr1-dev
Elliott Hughes [Tue, 11 Sep 2012 17:08:26 +0000 (10:08 -0700)]
am
ed757e97: am
290ac693: Merge "Stop building the unused host libmtp static library."
* commit '
ed757e9729b325f00e70f506ad6e217910563d0a':
Stop building the unused host libmtp static library.
Elliott Hughes [Tue, 11 Sep 2012 17:04:48 +0000 (10:04 -0700)]
am
290ac693: Merge "Stop building the unused host libmtp static library."
* commit '
290ac69379e649a2fed1d9441a17e39c6a912d8c':
Stop building the unused host libmtp static library.
Elliott Hughes [Tue, 11 Sep 2012 16:57:54 +0000 (09:57 -0700)]
Merge "Stop building the unused host libmtp static library."
Elliott Hughes [Tue, 11 Sep 2012 16:33:46 +0000 (09:33 -0700)]
Stop building the unused host libmtp static library.
This removes the need to support the bionic mktime_tz and localtime_tz
extensions on glibc, which makes my life easier.
Bug:
7012465
Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
Eric Laurent [Tue, 11 Sep 2012 15:33:52 +0000 (08:33 -0700)]
Merge "Limit maximum equalizer gain." into jb-mr1-dev
Jean-Michel Trivi [Tue, 11 Sep 2012 01:58:27 +0000 (18:58 -0700)]
Communicate audio session ID to downmixer
The audio downmixer effect might need the audio session Id, pass it
from the track creation in AudioFlinger to the downmix effect
creation in AudioMixer.
Change-Id: I5e29540542ae89cf4a0cdb537b3e67f04442a20a
Eino-Ville Talvala [Tue, 11 Sep 2012 01:44:37 +0000 (18:44 -0700)]
Merge "Camera2: Temporarily stop pre-allocation of recording stream." into jb-mr1-dev
Eino-Ville Talvala [Tue, 11 Sep 2012 01:44:33 +0000 (18:44 -0700)]
Merge "Camera2: Clean up the right streams." into jb-mr1-dev
Eric Laurent [Mon, 10 Sep 2012 23:27:35 +0000 (16:27 -0700)]
Limit maximum equalizer gain.
Limit maximum gain in all EQ bands according to current volume so that
total gain (current volume + band gain) does not exceed a certain limit.
The gain difference between bands is preserved.
Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
Eric Laurent [Mon, 10 Sep 2012 23:46:31 +0000 (16:46 -0700)]
Merge "audio effects: no audio preprocessing by default" into jb-mr1-dev
Eric Laurent [Sat, 8 Sep 2012 00:31:18 +0000 (17:31 -0700)]
audio effects: no audio preprocessing by default
The audio preprocessings are not included in the default
audio_effect.conf file anymore as the audio HAL has to provide
support for them.
Each product implementing one or more audio pre processing must
provide a specific audio_effects.conf file.
Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
James Dong [Sat, 8 Sep 2012 00:27:50 +0000 (17:27 -0700)]
Allow OMXCodec to specify an output color format for OMX decoder component
The output color format is specified via the meta argument in OMXCodec::Create()
o related-to-bug:
7122195
Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
Eino-Ville Talvala [Mon, 10 Sep 2012 23:07:03 +0000 (16:07 -0700)]
Camera2: Temporarily stop pre-allocation of recording stream.
When recordingHint is set, don't pre-allocate recording stream on
preview start.
Bug:
7137947
Change-Id: I06b5f6d7dbb21d4d0747974ba001b0c8929a0b02
Eino-Ville Talvala [Mon, 10 Sep 2012 20:30:43 +0000 (13:30 -0700)]
Camera2: Clean up the right streams.
Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48
Eino-Ville Talvala [Mon, 10 Sep 2012 18:59:12 +0000 (11:59 -0700)]
Camera: Add HDR scene mode constants.
Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
Andreas Huber [Mon, 10 Sep 2012 18:36:44 +0000 (11:36 -0700)]
Merge "Enable audio streaming to a wifi display. Remove startup delay hack." into jb-mr1-dev