summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-037-15/+15
|\
| * am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32"Glenn Kasten2014-04-037-16/+16
| |\
| | * 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
* | | | am 8260bf63: am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-030-0/+0
|\ \ \ \ | |/ / /
| * | | am 93bbc834: Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
| |\ \ \ | | |/ /
| | * | Merge "Fix aac decoder flush"Glenn Kasten2014-04-031-0/+6
| | |\ \ | | | |/
| | | * Fix aac decoder flushMarco Nelissen2014-04-021-0/+6
* | | | am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer ...Jeff Tinker2014-04-031-0/+16
|\ \ \ \ | |/ / /
| * | | am 81e0bd44: Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-031-0/+16
| |\ \ \
| | * | | Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
* | | | | 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
* | | | | | Merge commit '54654025' into manualmergeGlenn Kasten2014-04-020-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 2b2fbe29: Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix decoder EOS handling"Glenn Kasten2014-04-026-203/+213
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fix decoder EOS handlingMarco Nelissen2014-04-026-203/+213
| | |/ / /
* | | | | 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
* | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-016-19/+154
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-016-19/+154
| |\ \ \ | | | |/ | | |/|
| | * | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-296-19/+154
* | | | 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
* | | | | 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
* | | | | | Merge changes I5748f47d,I3f074933Glenn Kasten2014-04-014-1/+117
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add FastThread.hGlenn Kasten2014-03-311-0/+38
| * | | | | Add FastThreadStateGlenn Kasten2014-03-313-1/+79
| |/ / / /
* | | | | Add FIXMEs to createRecord for fast captureGlenn Kasten2014-03-312-9/+13
|/ / / /
* | | | ACodec: ignore OMX messages to already freed componentLajos Molnar2014-03-281-0/+8
* | | | mediaplayer: add temporary developer settings to use NuPlayer as defaultLajos Molnar2014-03-281-0/+6
* | | | 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
* | | | | am 4f1ef2cd: (-s ours) am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert ...Lajos Molnar2014-03-280-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-283-56/+30
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-283-56/+30
| | |\ \ \
| | | * \ \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu...Lajos Molnar2014-03-283-56/+30
| | | |\ \ \
| | | | * | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-273-56/+30
* | | | | | | am ff382d0c: (-s ours) am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert ...Lajos Molnar2014-03-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for...Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue...Lajos Molnar2014-03-282-10/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be o...Lajos Molnar2014-03-282-10/+7
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
* | | | | | | CameraMetadata: Fix String tag update null character issueZhijun He2014-03-271-1/+2
* | | | | | | 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
* | | | | | | | Fix the buildEric Laurent2014-03-262-5/+5
* | | | | | | | 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