summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Fix build.Marco Nelissen2014-05-151-1/+1
* Merge "Unify error/status codes"Marco Nelissen2014-05-156-73/+78
|\
| * Unify error/status codesMarco Nelissen2014-05-156-73/+78
* | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-151-1/+1
|\ \
| * | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-151-1/+1
| |/
* | Merge "Update OMX messages for 64 bit"Andy Hung2014-05-152-3/+3
|\ \ | |/ |/|
| * Update OMX messages for 64 bitAndy Hung2014-05-142-3/+3
* | Merge "Fix typos and pointer math."Marco Nelissen2014-05-142-2/+2
|\ \
| * | Fix typos and pointer math.Marco Nelissen2014-05-142-2/+2
* | | WIP: MediaDrm NDK APIsJeff Tinker2014-05-131-0/+470
|/ /
* | Some crypto stuff, error codesMarco Nelissen2014-05-134-3/+176
|/
* Merge "Add AMediaCodec callback"Marco Nelissen2014-05-131-1/+11
|\
| * Add AMediaCodec callbackMarco Nelissen2014-05-091-1/+11
* | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-091-1/+1
* | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-091-1/+6
* | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-091-3/+0
* | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-092-1/+5
* | MediaCodec: add renderAndReleaseOutputBuffer() method with timestampLajos Molnar2014-05-081-0/+1
* | Merge "Add client side support for more AUDIO_FORMAT_PCM_*"Glenn Kasten2014-05-081-2/+3
|\ \ | |/ |/|
| * Add client side support for more AUDIO_FORMAT_PCM_*Glenn Kasten2014-05-071-2/+3
* | Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-081-5/+9
* | Merge "Expand AMediaFormat"Marco Nelissen2014-05-071-2/+20
|\ \
| * | Expand AMediaFormatMarco Nelissen2014-05-071-2/+20
* | | Merge "Add NDK version of MediaMuxer"Marco Nelissen2014-05-072-1/+76
|\ \ \ | |/ /
| * | Add NDK version of MediaMuxerMarco Nelissen2014-05-072-1/+76
| |/
* | Merge "Remove legacy omx_message variables"Andy Hung2014-05-071-2/+0
|\ \ | |/ |/|
| * Remove legacy omx_message variablesAndy Hung2014-05-061-2/+0
* | MediaFormat owns its stringsMarco Nelissen2014-05-061-2/+4
|/
* Merge "WIP: MediaCodec and friends NDK APIs, plain C version"Marco Nelissen2014-05-053-0/+357
|\
| * WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-053-0/+357
* | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+22
|/
* Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-031-22/+1
|\
| * Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-031-22/+1
* | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-021-1/+22
|\ \ | |/
| * camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+22
* | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator...Lajos Molnar2014-05-021-0/+110
|\ \ | |/ |/|
| * am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind...Lajos Molnar2014-05-021-0/+110
| |\
| | * am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...Lajos Molnar2014-05-021-0/+110
| | |\
| | | * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-011-0/+110
| | * | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-294-0/+212
| | |\ \ | | | |/ | | |/|
| | | * am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/r...Igor Murashkin2014-03-251-0/+203
| | | |\
| | | * \ am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | | |\ \
| | | * \ \ am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-132-0/+2
| | | |\ \ \
| | | * \ \ \ am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-081-0/+1
| | | |\ \ \ \
| | | * \ \ \ \ am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-071-0/+3
| | | |\ \ \ \ \
| | | * \ \ \ \ \ am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-072-6/+18
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-072-4/+4
| | | |\ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ am f131f873: Merge "Add private method NBLog::Reader::dumpLine()"Glenn Kasten2014-04-281-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-04-281-0/+6
* | | | | | | | | | | Merge "CameraService: fix race condition and wrong last frame number."Jianing Wei2014-04-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \