summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Unify error/status codes"Marco Nelissen2014-05-1512-218/+233
|\
| * Unify error/status codesMarco Nelissen2014-05-1512-218/+233
* | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-152-6/+69
|\ \
| * | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-152-6/+69
| |/
* | ACodec: remove PTS log spamLajos Molnar2014-05-152-4/+2
* | Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"Andy Hung2014-05-153-0/+22
|\ \
| * | Send 64 bit OMX codec handling to 32 bit MediaServerAndy Hung2014-05-143-0/+22
* | | Merge "Update OMX messages for 64 bit"Andy Hung2014-05-1511-152/+238
|\ \ \ | |/ /
| * | Update OMX messages for 64 bitAndy Hung2014-05-1411-152/+238
* | | am 4b7c5444: am e32106fd: screenrecord: Add raw frames output formatBenoit Goby2014-05-143-17/+24
|\ \ \ | |_|/ |/| |
| * | am e32106fd: screenrecord: Add raw frames output formatBenoit Goby2014-05-143-17/+24
| |\ \
| | * | screenrecord: Add raw frames output formatBenoit Goby2014-05-133-17/+24
* | | | Only export necessary symbolsMarco Nelissen2014-05-147-25/+114
* | | | Merge "Fix typos and pointer math."Marco Nelissen2014-05-144-10/+8
|\ \ \ \
| * | | | Fix typos and pointer math.Marco Nelissen2014-05-144-10/+8
* | | | | Merge "WIP: MediaDrm NDK APIs"Jeff Tinker2014-05-143-0/+1077
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | WIP: MediaDrm NDK APIsJeff Tinker2014-05-133-0/+1077
* | | | | Merge "Pull up mFlags and isFastTrack from Track to TrackBase"Glenn Kasten2014-05-145-10/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Pull up mFlags and isFastTrack from Track to TrackBaseGlenn Kasten2014-05-135-10/+12
* | | | | Merge "Explicitly include Configuration.h"Glenn Kasten2014-05-132-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Explicitly include Configuration.hGlenn Kasten2014-05-132-0/+3
* | | | | Merge "Fix memory corruption if increaseSamplingN is not called"Glenn Kasten2014-05-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix memory corruption if increaseSamplingN is not calledGlenn Kasten2014-05-131-1/+1
* | | | | Some crypto stuff, error codesMarco Nelissen2014-05-139-12/+612
| |_|_|/ |/| | |
* | | | AudioFlinger: add specific mutex for client listsEric Laurent2014-05-136-92/+87
* | | | Merge "Add AMediaCodec callback"Marco Nelissen2014-05-132-14/+117
|\ \ \ \
| * | | | Add AMediaCodec callbackMarco Nelissen2014-05-092-14/+117
* | | | | am 4ae3cfd8: (-s ours) am 21bde57f: Add frame dump outputAndy McFadden2014-05-130-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 21bde57f: Add frame dump outputAndy McFadden2014-05-128-87/+512
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Add frame dump outputAndy McFadden2014-05-128-87/+512
* | | | | am c1b0056e: (-s ours) am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
| |\ \ \ \ | | |/ / /
| | * | | Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
* | | | | Merge "Camera: Don't enable log spew by default for eng build"Zhijun He2014-05-122-8/+4
|\ \ \ \ \
| * | | | | Camera: Don't enable log spew by default for eng buildZhijun He2014-05-122-8/+4
| | |_|_|/ | |/| | |
* | | | | Merge "audiopolicy: refactor audio command threads"Eric Laurent2014-05-122-118/+83
|\ \ \ \ \
| * | | | | audiopolicy: refactor audio command threadsEric Laurent2014-05-122-118/+83
* | | | | | am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry coun...Eino-Ville Talvala2014-05-121-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before read...Eino-Ville Talvala2014-05-121-0/+3
| |\ \ \ \
| | * \ \ \ am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | |\ \ \ \
| | | * \ \ \ Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | | |\ \ \ \
| | | | * | | | camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
* | | | | | | | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-092-2/+2
* | | | | | | | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-092-5/+13
* | | | | | | | Explicitly ignore return value of __futex_syscall3Glenn Kasten2014-05-091-2/+2
* | | | | | | | Cache mCblk in local variable cblkGlenn Kasten2014-05-091-5/+7
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge "Remove obsolete IAudioRecord::getCblk()"Glenn Kasten2014-05-094-29/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-094-29/+1
* | | | | | | | Merge "audioflinger: refactor thread config events"Eric Laurent2014-05-094-384/+436
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | audioflinger: refactor thread config eventsEric Laurent2014-05-094-384/+436