summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Allow DRM client to pass the FD of an open file to the DRM server.Gene Morgan2012-09-201-4/+16
| | | | | | | | | | | | | 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
* Merge "Camera2: Increase capture timeout." into jb-mr1-devEino-Ville Talvala2012-09-181-1/+1
|\
| * Camera2: Increase capture timeout.Eino-Ville Talvala2012-09-181-1/+1
| | | | | | | | | | | | | | Low-light modes may take longer to capture a picture, so increase the timeouts. Change-Id: Id50b1e4fd3186da4e75b2cc1c226ced2f8d394ac
* | Camera2: Enable ZSL by default.Eino-Ville Talvala2012-09-181-4/+4
| | | | | | | | | | Bug: 6910087 Change-Id: Ie774f28fbb943b2ac2c856872fd4cae68b40430c
* | Merge "Camera2: ZSL: Do regular capture if AE is not satisfied." into jb-mr1-devEino-Ville Talvala2012-09-184-12/+80
|\ \
| * | Camera2: ZSL: Do regular capture if AE is not satisfied.Eino-Ville Talvala2012-09-184-12/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "Fix THD with max user EQ preset volume again" into jb-mr1-devEric Laurent2012-09-182-93/+79
|\ \ \
| * | | Fix THD with max user EQ preset volume againEric Laurent2012-09-172-93/+79
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-devEino-Ville Talvala2012-09-182-5/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Camera2: Don't be bothered by lack of faces. Camera2: Filter out faces with 0 confidence. Camera2: Change face detect/scene mode priority.
| * | | Camera2: Don't be bothered by lack of faces.Eino-Ville Talvala2012-09-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Camera2: Filter out faces with 0 confidence.Eino-Ville Talvala2012-09-171-1/+7
| | | | | | | | | | | | | | | | | | | | Bug: 7078231 Change-Id: I559f1281359835e0489456091a5409ebc8f73479
| * | | Camera2: Change face detect/scene mode priority.Eino-Ville Talvala2012-09-171-2/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | Explicit scene modes should override the implicit face priority scene mode from enabling face detection, to match application/API expectations. Change-Id: I6f0f44fadeacfdc0594dd2fdc280e294d2d87df6
* | | Now we only support a single client connectionAndreas Huber2012-09-173-128/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Support for RTP/RTCP traffic over TCP sockets in wifi display code.Andreas Huber2012-09-177-109/+397
|/ / | | | | | | | | | | | | | | This is opt-in through adb shell setprop media.wfd.enable-tcp true Change-Id: I49ab22a8c8d62690065631e781a7f0057e5ce557
* | Merge "Camera2: Don't play shutter sound when doing a video snapshot" into ↵Eino-Ville Talvala2012-09-171-1/+2
|\ \ | | | | | | | | | jb-mr1-dev
| * | Camera2: Don't play shutter sound when doing a video snapshotEino-Ville Talvala2012-09-151-1/+2
| |/ | | | | | | | | Bug: 7171820 Change-Id: I11ec0900aff3cdf4b57ae1bfc75f7acfecf95098
* | Fixed a native crash due to deref of a NULL pointerJames Dong2012-09-141-1/+2
|/ | | | | | | | 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
* Merge "Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new ↵Eino-Ville Talvala2012-09-141-1/+1
|\ | | | | | | gralloc scheme.""" into jb-mr1-dev
| * Revert "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc ↵Eino-Ville Talvala2012-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | scheme."" The changes this commit depends on are now submitted. This reverts commit f54b1459cda7f585b4896671643b33bab8290964 Change-Id: If7f146ab7968d50fffd2174c2c5792bdc9d7724c
* | Merge "Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc ↵Eino-Ville Talvala2012-09-141-1/+1
|\ \ | |/ | | | | scheme."" into jb-mr1-dev
| * Revert "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme."Igor Murashkin2012-09-141-1/+1
| | | | | | | | | | | | This reverts commit 8a3016613dc684a6be11fdf643f9cc5cad817e8f Change-Id: I3f1d4e9c13df838b8b6aa5696a6494140eac3e04
* | Merge "Make a small correction in terms of GOP structure in the recorded ↵James Dong2012-09-141-1/+1
|\ \ | | | | | | | | | video" into jb-mr1-dev
| * | Make a small correction in terms of GOP structure in the recorded videoJames Dong2012-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme." into ↵Igor Murashkin2012-09-141-1/+1
|\ \ \ | |/ / |/| / | |/ jb-mr1-dev
| * Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.Eino-Ville Talvala2012-09-131-1/+1
| | | | | | | | | | | | | | | | 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
* | Merge "Allow OMXCodec to specify an output color format for OMX decoder ↵James Dong2012-09-143-8/+65
|\ \ | | | | | | | | | component" into jb-mr1-dev
| * | Allow OMXCodec to specify an output color format for OMX decoder componentJames Dong2012-09-103-8/+65
| | | | | | | | | | | | | | | | | | | | | | | | The output color format is specified via the meta argument in OMXCodec::Create() o related-to-bug: 7122195 Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
* | | Merge "Support IDR requests in wifi display, MediaCodec and ACodec." into ↵Dave Burke2012-09-139-1/+100
|\ \ \ | | | | | | | | | | | | jb-mr1-dev
| * | | Support IDR requests in wifi display, MediaCodec and ACodec.Andreas Huber2012-09-139-1/+100
| | | | | | | | | | | | | | | | Change-Id: I596cf8dd61b63465437f78413186fad2be287244
* | | | audioflinger: send priority request from a threadEric Laurent2012-09-133-38/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Handle audio HAL returning 0 bytes in record threadJean-Michel Trivi2012-09-131-4/+4
| |_|/ |/| | | | | | | | | | | | | | | | | Enter standby when HAL returns an error, but also consider 0 bytes returned as NOT_ENOUGH_DATA. Change-Id: Ica83142310e9c176f936e0440571a6034cbc575f
* | | Merge "Workaround for track recreation bug" into jb-mr1-devJean-Michel Trivi2012-09-131-1/+2
|\ \ \ | |/ / |/| |
| * | Workaround for track recreation bugJean-Michel Trivi2012-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Don't deadlock on AudioRecord start when reads return 0" into jb-mr1-devEric Laurent2012-09-131-8/+14
|\ \ \
| * | | Don't deadlock on AudioRecord start when reads return 0Jean-Michel Trivi2012-09-121-8/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Better video bandwidth utilization by not lying about the frame rate.Andreas Huber2012-09-133-2/+13
| | | | | | | | | | | | | | | | | | log network bandwidth used (for data traffic). Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
* | | Various improvements to cleanly shutdown a wfd session.Andreas Huber2012-09-136-49/+86
| | | | | | | | | | | | Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
* | | Merge "Audio and video bitrate are now configurable through system ↵Andreas Huber2012-09-131-2/+23
|\ \ \ | | | | | | | | | | | | properties" into jb-mr1-dev
| * | | Audio and video bitrate are now configurable through system propertiesAndreas Huber2012-09-131-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb shell setprop media.wfd.audio-bitrate 64000 adb shell setprop media.wfd.video-bitrate 10000000 are the defaults. Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
* | | | Merge "Use proper number of video buffers to be acquired simultaneously ↵Andreas Huber2012-09-131-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | from" into jb-mr1-dev
| * | | | Use proper number of video buffers to be acquired simultaneously fromAndreas Huber2012-09-131-2/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | SurfaceMediaSource, this should match the number of encoder input buffers. Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
* | | | Throttle SurfaceMediaSource.Andreas Huber2012-09-132-12/+39
|/ / / | | | | | | | | | Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
* | | Camera2: Fix ZSL bugs.Eino-Ville Talvala2012-09-123-24/+52
|/ / | | | | | | | | | | | | | | | | | | | | | | 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
* | am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last ↵Jean-Baptiste Queru2012-09-121-0/+3
|\ \ | | | | | | | | | | | | | | | | | | output frame" * commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d': avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
| * \ am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"Jean-Baptiste Queru2012-09-121-0/+3
| |\ \ | | | | | | | | | | | | | | | | * commit '1b0ae9e47273357e19a9beb22466319753e8242d': avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
| | * \ Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"Jean-Baptiste Queru2012-09-121-0/+3
| | |\ \
| | | * | avcenc: Set OMX_BUFFERFLAG_EOS on the last output frameMartin Storsjo2012-08-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, the caller might hang waiting for more output buffers. Change-Id: Ief6be00b7600be8498a953e8e88f0582ea8fce85
* | | | | Merge "Various improvements to the wifi display implementation." into jb-mr1-devAndreas Huber2012-09-129-66/+448
|\ \ \ \ \
| * | | | | Various improvements to the wifi display implementation.Andreas Huber2012-09-129-66/+448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."Elliott Hughes2012-09-122-2/+4
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit 'fd07d61614e4b358349d1d46a32f9477784404c4': Don't include <linux/socket.h> directly.