summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-037-15/+15
|\ | | | | | | Change-Id: I7a6105f467a2fa3631c62be3d306845e9cf9b365
| * am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
| |\ | | | | | | | | | | | | * commit '51b3ea2b8f7298bffbd246c65a606cd053357b66': 64-bit: Correction to OMX_U32 and OMX_S32
| | * Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
| | |\
| | | * 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-027-16/+16
| | | | | | | | | | | | | | | | Change-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15
* | | | am 8260bf63: am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-030-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8260bf63e2fa974b524029f170d9ad17b69b884f': Fix aac decoder flush
| * | | am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '93bbc8343133b910aeae536617efce978040bbae': Fix aac decoder flush
| | * | Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
| | |\ \ | | | |/
| | | * Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | b/8543366 Change-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b
* | | | am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer ↵Jeff Tinker2014-04-031-0/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | APIs * commit 'd009aa2bac4a4c8ca2e0c1203148194e237cc5d0': Add signature|system permission to MediaDrm signer APIs
| * | | am 81e0bd44: Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-031-0/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '81e0bd44a10e90778ab5b0a3babd4fc52cadedd8': Add signature|system permission to MediaDrm signer APIs
| | * | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394 related-to-bug: 12702350
* | | | | Merge "Change references of Q19.12 to Q4.27 for clarity"Andy Hung2014-04-035-9/+10
|\ \ \ \ \
| * | | | | Change references of Q19.12 to Q4.27 for clarityAndy Hung2014-04-025-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5beb7daf6ff9bc123ff3582f7c294edcaf8652f6 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | Merge commit '54654025' into manualmergeGlenn Kasten2014-04-020-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I2df92dbae606cc9805ff5dd7abc2f53b60108112
| * | | | | am 2b2fbe29: Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | * commit '2b2fbe299163b544668b41f594943a19b78dafd3': Fix decoder EOS handling
| | * | | | Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fix decoder EOS handlingMarco Nelissen2014-04-026-203/+213
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conceptually it should be the same whether EOS is signalled on the last buffer holding data, or an empty buffer that follows. Make it so that this actually behaves the same for mp3, AAC and Vorbis. b/8747869 Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
* | | | | Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"Lajos Molnar2014-04-022-4/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | ACodec: do not signal kWhatShutdownCompleted on codec errorLajos Molnar2014-04-012-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not signal kWhatShutdownCompleted when moving to Uninitialized state due to receiving a codec error. Do not abort if error happens just before handling a stop request. Bug: 13675112 Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
* | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-016-19/+154
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-016-19/+154
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| | * | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-296-19/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
* | | | Merge "MediaCodec: move to UNINITIALIZED state on codec error"Lajos Molnar2014-04-011-0/+2
|\ \ \ \
| * | | | MediaCodec: move to UNINITIALIZED state on codec errorLajos Molnar2014-03-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec moves to Uninitialized state after receiving codec error. Make MediaCodec also move to the same state, so stop() and release() will work correctly. Bug: 13675112 Change-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72
* | | | | Merge "FastMixer use FastThread and FastMixerState use FastThreadState"Glenn Kasten2014-04-013-18/+13
|\ \ \ \ \
| * | | | | FastMixer use FastThread and FastMixerState use FastThreadStateGlenn Kasten2014-03-313-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I594c973e9f575113bdefee6f4cf8c29d8beac1f3
* | | | | | Merge changes I5748f47d,I3f074933Glenn Kasten2014-04-014-1/+117
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add FastThread.h Add FastThreadState
| * | | | | Add FastThread.hGlenn Kasten2014-03-311-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5748f47dbfa42c14cc93973742e05ac963bf3ba8
| * | | | | Add FastThreadStateGlenn Kasten2014-03-313-1/+79
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I3f07493375ace6e5cfdcd02ad90c4b6fad543b0c
* | | | | Add FIXMEs to createRecord for fast captureGlenn Kasten2014-03-312-9/+13
|/ / / / | | | | | | | | | | | | Change-Id: I759be200fae32969212c52a409f46f2e704081e3
* | | | ACodec: ignore OMX messages to already freed componentLajos Molnar2014-03-281-0/+8
| | | | | | | | | | | | | | | | | | | | Bug: 12916984 Change-Id: I92848797b8d556cff468b9b0f0a618946083208f
* | | | mediaplayer: add temporary developer settings to use NuPlayer as defaultLajos Molnar2014-03-281-0/+6
| | | | | | | | | | | | | | | | | | | | Bug: 11784824 Change-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8
* | | | Merge "Mark the logging heap read-only to media.log service"Glenn Kasten2014-03-281-1/+1
|\ \ \ \
| * | | | Mark the logging heap read-only to media.log serviceGlenn Kasten2014-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie26a9e7e37c951774c71d2c53886db52dd5479aa
* | | | | am 4f1ef2cd: (-s ours) am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert ↵Lajos Molnar2014-03-280-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | "mediaplayer: keep more buffers with the BufferQueue"" into klp-dev * commit '4f1ef2cd65d734edae17f8586cf717598b40f2c3': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| * | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep ↵Lajos Molnar2014-03-283-56/+30
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | more buffers with the BufferQueue"" into klp-dev * commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | * | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers ↵Lajos Molnar2014-03-283-56/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the BufferQueue"" into klp-dev * commit 'f780d28de2e3cf7f6b26b9626321dba75719736e': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | | * \ \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the ↵Lajos Molnar2014-03-283-56/+30
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | BufferQueue"" into klp-dev
| | | | * | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-273-56/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b635b0e66b257ab442e230bca96afd5105cf6829. Bug: 13655631
* | | | | | | am ff382d0c: (-s ours) am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert ↵Lajos Molnar2014-03-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "stagefright: allow for minUndequeuedBufs to be one less"" into klp-dev * commit 'ff382d0c40493303ceb81a6c22d1a48c0fecfe9c': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| * | | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow ↵Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for minUndequeuedBufs to be one less"" into klp-dev * commit '8bf96c011ff4128f9bf06b892a38d869192d6a25': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| | * | | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for ↵Lajos Molnar2014-03-282-10/+7
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minUndequeuedBufs to be one less"" into klp-dev * commit '3d4e4fcbcfc5c16dd794591727f5c713831ab6dc': DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"
| | | * | | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be ↵Lajos Molnar2014-03-282-10/+7
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | one less"" into klp-dev
| | | | * | | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a0470879e25394cb85437366fa53ce8055cd556f. Bug: 13655631
* | | | | | | CameraMetadata: Fix String tag update null character issueZhijun He2014-03-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String8.size() doesn't count the null character in whatever case. But camera metadata tag android.jpeg.gpsProcessingMethod need a null-terminited string. Bug: 13679912 Change-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53
* | | | | | | Merge "Camera3: fix HAL3.x version check issue"Zhijun He2014-03-275-5/+17
|\ \ \ \ \ \ \
| * | | | | | | Camera3: fix HAL3.x version check issueZhijun He2014-03-275-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera service should support HAL3.x instead of only HAL3.0. Bug: 13609405 Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
* | | | | | | | Fix the buildEric Laurent2014-03-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41
* | | | | | | | Merge "audio policy: remove obsolete AudioPolicyManager class members"Eric Laurent2014-03-272-38/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | audio policy: remove obsolete AudioPolicyManager class membersEric Laurent2014-03-262-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mHasA2dp, mHasUsb and mHasRemoteSubmix members from AudoPolicyManager. They are not needed any more since we use device descriptors with additional attributes. Also remove obsolete limitation on device address length (MAX_DEVICE_ADDRESS_LEN). Change-Id: Iffe760a521692a4b50be3f6b935af84afb61bb86
generated by cgit v1.1 at 2024-06-29 16:08:26 +0000