summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CameraService: fix race condition and wrong last frame number.Jianing Wei2014-04-171-0/+4
* | | | | | | | | | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / /
| * | | | | | | | | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | media: 64 bit compile issuesMark Salyzyn2014-04-151-1/+1
| * | | | | | | | | | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | warnings be gone.Andreas Huber2014-04-111-1/+1
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-103-8/+132
* | | | | | | | | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-041-0/+2
* | | | | | | | | | stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+3
* | | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-041-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-4/+5
* | | | | | | | | | | Merge "ACodec: do not signal kWhatShutdownCompleted on codec error"Lajos Molnar2014-04-021-0/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ACodec: do not signal kWhatShutdownCompleted on codec errorLajos Molnar2014-04-011-0/+1
* | | | | | | | | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+12
| * | | | | | | | | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-281-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-281-1/+0
| | |\ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-05-06 08:39:12 +0000