summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-082-9/+22
|\
| * Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-072-9/+22
* | Merge "Make AMediaCodec_create* APIs more like their Java counterparts"Marco Nelissen2014-05-082-11/+16
|\ \
| * | Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-082-11/+16
* | | Merge "Add a per-thread heap that is read-only to clients"Glenn Kasten2014-05-082-0/+19
|\ \ \ | |/ / |/| |
| * | Add a per-thread heap that is read-only to clientsGlenn Kasten2014-05-072-0/+19
* | | Merge "audio policy: cleanup AudioPolicyService destructor"Eric Laurent2014-05-081-3/+1
|\ \ \
| * | | audio policy: cleanup AudioPolicyService destructorEric Laurent2014-05-071-3/+1
* | | | Merge "Expand AMediaFormat"Marco Nelissen2014-05-072-12/+64
|\ \ \ \ | |_|/ / |/| | |
| * | | Expand AMediaFormatMarco Nelissen2014-05-072-12/+64
* | | | Merge "Add NDK version of MediaMuxer"Marco Nelissen2014-05-077-5/+180
|\ \ \ \ | |/ / /
| * | | Add NDK version of MediaMuxerMarco Nelissen2014-05-077-5/+180
| | |/ | |/|
* | | Merge "Fix a couple of fast capture typo bugs"Glenn Kasten2014-05-072-4/+4
|\ \ \
| * | | Fix a couple of fast capture typo bugsGlenn Kasten2014-05-072-4/+4
| |/ /
* | | Merge "Remove legacy omx_message variables"Andy Hung2014-05-074-52/+12
|\ \ \
| * | | Remove legacy omx_message variablesAndy Hung2014-05-064-52/+12
* | | | audio policy: fix typo in AudioPolicyManager constructorEric Laurent2014-05-071-6/+6
| |_|/ |/| |
* | | Merge "audio policy: update from libhardware_legacy"Eric Laurent2014-05-072-108/+349
|\ \ \ | |_|/ |/| |
| * | audio policy: update from libhardware_legacyEric Laurent2014-05-062-108/+349
| |/
* | Merge "MediaFormat owns its strings"Marco Nelissen2014-05-062-4/+19
|\ \
| * | MediaFormat owns its stringsMarco Nelissen2014-05-062-4/+19
* | | Merge "Camera3: fix missing string in logging code"Zhijun He2014-05-061-1/+1
|\ \ \ | |_|/ |/| |
| * | Camera3: fix missing string in logging codeZhijun He2014-05-061-1/+1
* | | am 71171988: am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering ...Eric Laurent2014-05-062-10/+27
|\ \ \
| * \ \ am f655acf1: am 8fb04d47: Merge "Fix memory leak when filtering commands in i...Eric Laurent2014-05-062-10/+27
| |\ \ \
| | * \ \ am 8fb04d47: Merge "Fix memory leak when filtering commands in insertCommand_...Eric Laurent2014-05-062-10/+27
| | |\ \ \
| | | * \ \ Merge "Fix memory leak when filtering commands in insertCommand_l()"Eric Laurent2014-05-062-10/+27
| | | |\ \ \
| | | | * | | Fix memory leak when filtering commands in insertCommand_l()Jesper Tragardh2014-04-112-10/+27
* | | | | | | Merge "Remove warnings in recordvideo"Andy Hung2014-05-061-5/+9
|\ \ \ \ \ \ \
| * | | | | | | Remove warnings in recordvideoAndy Hung2014-05-051-5/+9
* | | | | | | | Merge "Fix audioloop test program"Andy Hung2014-05-061-62/+108
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix audioloop test programAndy Hung2014-05-051-62/+108
* | | | | | | Merge "Don't build libmediandk for PDK"Marco Nelissen2014-05-051-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Don't build libmediandk for PDKMarco Nelissen2014-05-051-1/+5
* | | | | | | | Merge "WIP: MediaCodec and friends NDK APIs, plain C version"Marco Nelissen2014-05-058-0/+1066
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-058-0/+1066
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Use audio_is_linear_pcm()"Glenn Kasten2014-05-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Use audio_is_linear_pcm()Glenn Kasten2014-05-021-2/+2
* | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-054-15/+192
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-024-15/+192
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "NULL check in ConnectPro"Natalie Silvanovich2014-05-051-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
* | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-034-191/+14
|\ \ \ \ \ \ \
| * | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-034-191/+14
* | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-024-14/+191
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-024-14/+191
* | | | | | | | Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-022-5/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-022-5/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge "Camera3: Don't notifyError for non-fatal errors"Zhijun He2014-05-021-3/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera3: Don't notifyError for non-fatal errorsZhijun He2014-05-011-3/+0