summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure we only release the HDCP module once shutdown has completed.Andreas Huber2012-09-264-14/+49
| | | | | Change-Id: I4b614afe2b55ac53b4aa63311e5bea8fd6c4462e related-to-bug: 7223555
* Merge "Fix shutdown and eliminate those annoying "failed to post..." logs." ↵Andreas Huber2012-09-261-1/+4
|\ | | | | | | into jb-mr1-dev
| * Fix shutdown and eliminate those annoying "failed to post..." logs.Andreas Huber2012-09-261-1/+4
| | | | | | | | | | Change-Id: I963e0712f59070f83a26946c494fdeb3558aa0e3 related-to-bug: 7230886
* | Merge "Logic to include HDCP specific PES extra header data was backwards." ↵Andreas Huber2012-09-261-2/+2
|\ \ | | | | | | | | | into jb-mr1-dev
| * | Logic to include HDCP specific PES extra header data was backwards.Andreas Huber2012-09-261-2/+2
| |/ | | | | | | | | Change-Id: I85ab02f0c3ab945093b27210da1e36a31c022da5 related-to-bug: 7237850
* | Revert "Don't wait for presentation complete if terminated"Glenn Kasten2012-09-261-6/+6
|/ | | | | | This reverts commit 44cda3a4e7ca3de0db9cb49145def3803b03ebb4 Change-Id: I7fd29b77690dab057ac966a42fb198b2772f092c
* Implement android.media.AudioManager.getProperty()Glenn Kasten2012-09-256-2/+78
| | | | | Bug: 6635041 Change-Id: I3386a4a6c226bc4eceaf65556119e4fb15f73224
* Merge "Better transport stream timestamp handling." into jb-mr1-devAndreas Huber2012-09-254-111/+210
|\
| * Better transport stream timestamp handling.Andreas Huber2012-09-254-111/+210
| | | | | | | | | | | | | | | | 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
* | Merge "Add some more logging, reduce startup delay to 1 sec." into jb-mr1-devAndreas Huber2012-09-252-2/+6
|\ \ | |/
| * Add some more logging, reduce startup delay to 1 sec.Andreas Huber2012-09-252-2/+6
| | | | | | | | Change-Id: Ic24a3d9e3e645288411efb46f7004d89e7a0a4b7
* | Camera2: Make sure to clean out reprocess streams on shutdown as well.Eino-Ville Talvala2012-09-251-0/+1
| | | | | | | | | | | | | | Otherwise, streams may persist past expected lifetime. Bug: 6243944 Change-Id: I901971b78baf9d577ea3812588dec3885232e7ef
* | Camera2: Debug and logging fixes.Eino-Ville Talvala2012-09-2511-20/+81
| | | | | | | | | | | | | | | | | | | | - 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
* | audioflinger: improve record start and thread exitEric Laurent2012-09-251-2/+2
|/ | | | | | | | | | | | 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
* Tune video bitrate to 5 mbps.Dave Burke2012-09-241-1/+1
| | | | Change-Id: Ieb7ab1675db6fb21087a1258465f866ecdc5475b
* Merge "Camera2: Emit ShutterCallback/RawCallback events after takePicture" ↵Igor Murashkin2012-09-242-7/+34
|\ | | | | | | into jb-mr1-dev
| * Camera2: Emit ShutterCallback/RawCallback events after takePictureIgor Murashkin2012-09-242-7/+34
| | | | | | | | | | Bug: 7176692 Change-Id: I50e8f9511f1770d97a42d1fa208c04b1bbcfba6b
* | Merge "Camera2: Fix cropRegion sometimes exceeding the sensor array size" ↵Igor Murashkin2012-09-242-24/+117
|\ \ | | | | | | | | | into jb-mr1-dev
| * | Camera2: Fix cropRegion sometimes exceeding the sensor array sizeIgor Murashkin2012-09-242-24/+117
| |/ | | | | | | | | | | Bug: 7155264 Bug: 7120431 Change-Id: I92a9c695b97ec40acf26dbdaa877964e41a9fd4c
* | Merge "Check clock_gettime(CLOCK_MONOTONIC) for failure" into jb-mr1-devGlenn Kasten2012-09-242-0/+6
|\ \ | |/ |/|
| * Check clock_gettime(CLOCK_MONOTONIC) for failureGlenn Kasten2012-09-242-0/+6
| | | | | | | | | | Bug: 7100774 Change-Id: I15a84a19bb6d6ef1d9dac4beaa03587638196404
* | Merge "fix end of track presentation on suspended output" into jb-mr1-devEric Laurent2012-09-241-2/+13
|\ \
| * | fix end of track presentation on suspended outputEric Laurent2012-09-231-2/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Camera2: Truncate JPEG images" into jb-mr1-devAlex Ray2012-09-242-7/+172
|\ \
| * | Camera2: Truncate JPEG imagesAlex Ray2012-09-242-7/+172
| |/ | | | | | | | | | | | | | | 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
* | Attempt an orderly shutdown of the wifi display connection if possible.Andreas Huber2012-09-243-19/+57
|/ | | | | | | | Shutdown the session if the encoder signals an error. related-to-bug:7207481 Change-Id: Id78000a336f8bb8904e7d2102f8f81a4139cdd61
* Merge "Bug fix: MediaPlayer's deselectTrack() for subtitle." into jb-mr1-devJames Dong2012-09-232-3/+18
|\
| * Bug fix: MediaPlayer's deselectTrack() for subtitle.Insun Kang2012-09-202-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Camera2: Don't use ZSL when flash is on force fire mode." into jb-mr1-devEino-Ville Talvala2012-09-211-1/+2
|\ \
| * | Camera2: Don't use ZSL when flash is on force fire mode.Eino-Ville Talvala2012-09-211-1/+2
| | | | | | | | | | | | | | | Bug: 7213907 Change-Id: I120b187c1886d85f4b2b5d3a6f28a28936424e8e
* | | Merge "Camera2: Emit FaceDetection events for all except repeating 0-face ↵Igor Murashkin2012-09-212-5/+25
|\ \ \ | |/ / |/| | | | | frames" into jb-mr1-dev
| * | Camera2: Emit FaceDetection events for all except repeating 0-face framesIgor Murashkin2012-09-212-5/+25
| | | | | | | | | | | | | | | Bug: 7205311 Change-Id: I570209445acf3a26f2246c3fe886d56bb63bd2f8
* | | Remove legacy code and APIs in wifi display related code.Andreas Huber2012-09-2111-716/+9
| | | | | | | | | | | | Change-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa
* | | Tune video bitrate to 2.5 MBPS.Dave Burke2012-09-201-2/+1
| | | | | | | | | | | | | | | | | | Temporary workaround for buggy firmware (desired is 5 MBPS). Change-Id: I9fb0af31ca07c9bfdc6f790b7c98ca546eaf2985
* | | Merge "Allow DRM client to pass the FD of an open file to the DRM server." ↵Jeff Tinker2012-09-201-4/+16
|\ \ \ | | | | | | | | | | | | into jb-mr1-dev
| * | | 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 "Code to support RTP retransmission according to rfc4585, rfc4588" ↵Andreas Huber2012-09-203-35/+174
|\ \ \ | | | | | | | | | | | | into jb-mr1-dev
| * | | Code to support RTP retransmission according to rfc4585, rfc4588Andreas Huber2012-09-203-35/+174
| | | | | | | | | | | | | | | | Change-Id: Idfb3c0935f28e4cbc2141f0903f0d3c4e95818a6
* | | | Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-devEino-Ville Talvala2012-09-203-37/+85
|\ \ \ \
| * | | | Camera2: Clean up startup/shutdown sequences.Eino-Ville Talvala2012-09-203-37/+85
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Merge "Camera2: Erase ZSL queue after each use." into jb-mr1-devEino-Ville Talvala2012-09-203-1/+32
|\ \ \ \ | |/ / / |/| | |
| * | | Camera2: Erase ZSL queue after each use.Eino-Ville Talvala2012-09-203-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Camera2: State must be STOPPED before JPEG callback is fired." into ↵Eino-Ville Talvala2012-09-203-31/+39
|\ \ \ \ | |/ / / | | / / | |/ / |/| | jb-mr1-dev
| * | Camera2: State must be STOPPED before JPEG callback is fired.Eino-Ville Talvala2012-09-203-31/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Instantiate HDCP module, add PES_private_data for encrypted streams." ↵Andreas Huber2012-09-209-140/+572
|\ \ \ | | | | | | | | | | | | into jb-mr1-dev
| * | | Instantiate HDCP module, add PES_private_data for encrypted streams.Andreas Huber2012-09-199-140/+572
| | | | | | | | | | | | | | | | Change-Id: I970f561a56a1d489a392c3480dec13f4ed7b43bd
* | | | Merge "HDCP module binderized" into jb-mr1-devAndreas Huber2012-09-207-2/+43
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | HDCP module binderizedAndreas Huber2012-09-197-2/+43
| |/ | | | | | | Change-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6
* | Camera2: ZSL captures should also make some noise.Eino-Ville Talvala2012-09-191-0/+5
| | | | | | | | Change-Id: If7aff7223db41b4b7edeeb4c32e40ef3197b180b
* | Camera2: Increase max timeout for the precapture sequence.Eino-Ville Talvala2012-09-191-1/+1
|/ | | | | | | Increase maximum duration of the precapture sequence (final metering + preflash + redeye reduction) to 2 seconds before timing out. Change-Id: Ie1de4e96d46599eb53e1def9052b211e684f1fbc