summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Fix build.Marco Nelissen2014-05-151-1/+1
| | | | Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
* Merge "Unify error/status codes"Marco Nelissen2014-05-156-73/+78
|\
| * Unify error/status codesMarco Nelissen2014-05-156-73/+78
| | | | | | | | Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
* | 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
| |/ | | | | | | Change-Id: I48ac1d3ca5405c5909454c7a553917b31b9a50e5
* | Merge "Update OMX messages for 64 bit"Andy Hung2014-05-152-3/+3
|\ \ | |/ |/|
| * Update OMX messages for 64 bitAndy Hung2014-05-142-3/+3
| | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | Merge "Fix typos and pointer math."Marco Nelissen2014-05-142-2/+2
|\ \
| * | Fix typos and pointer math.Marco Nelissen2014-05-142-2/+2
| | | | | | | | | | | | Change-Id: I07f33a57454d013844b56bc3e57fe0a271e8b38c
* | | WIP: MediaDrm NDK APIsJeff Tinker2014-05-131-0/+470
|/ / | | | | | | | | Change-Id: I3ac08a3b027135c3fd2a9e95c5e8b3fd722df019 TODO: hooking up event handler, testing
* | Some crypto stuff, error codesMarco Nelissen2014-05-134-3/+176
|/ | | | | | | Add crypto/drm related functions, define some media errors instead of using magic numbers in the code. Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5
* Merge "Add AMediaCodec callback"Marco Nelissen2014-05-131-1/+11
|\
| * Add AMediaCodec callbackMarco Nelissen2014-05-091-1/+11
| | | | | | | | Change-Id: I33b7ff3bcdcff6d3a5e1db385b900ae18b7e0f03
* | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-091-1/+1
| | | | | | | | | | | | It obviously had not been compiled in a while. Change-Id: If514f474808e557a67a671c3b833572ad4a88338
* | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-091-1/+6
| | | | | | | | Change-Id: I2f6b68089ecfe85cd975d29ad0d0afd13c487002
* | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-091-3/+0
| | | | | | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
* | IAudioFlinger::openRecord returns IMemory(s)Glenn Kasten2014-05-092-1/+5
| | | | | | | | | | | | | | | | openRecord() now explicitly returns the control block and data buffer as separate IMemory references. If the IMemory for data buffer is 0, this means it immediately follows the control block. Change-Id: Ic098f88f0e037f8fbe30006689e18cacacf09d06
* | MediaCodec: add renderAndReleaseOutputBuffer() method with timestampLajos Molnar2014-05-081-0/+1
| | | | | | | | | | Bug: 11784827 Change-Id: Ia1dcbd6c1d1a4380db04b750c0eb3fa0bd58d7b4
* | 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
| | | | | | | | | | | | | | As much as possible, the checks for specific formats are done on server side. The only exception is 8-bit, which needs a client side workaround. Change-Id: I52fe086c039460c8dac009de03b67eb54c56a836
* | Make AMediaCodec_create* APIs more like their Java counterpartsMarco Nelissen2014-05-081-5/+9
| | | | | | | | | | | | and add configure flags. Change-Id: Ibfb7f8cad724fa1db2320966828104d40b5e6590
* | Merge "Expand AMediaFormat"Marco Nelissen2014-05-071-2/+20
|\ \
| * | Expand AMediaFormatMarco Nelissen2014-05-071-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove getDouble and getSize methods, since these are not used and/or not present in the corresponding Java MediaFormat API. Add setBuffer/getBuffer, needed for making formats for encoding, and add other setters. Change-Id: I528d51b4ed571d852b949637f7ae3a95d31da7c1
* | | Merge "Add NDK version of MediaMuxer"Marco Nelissen2014-05-072-1/+76
|\ \ \ | |/ /
| * | Add NDK version of MediaMuxerMarco Nelissen2014-05-072-1/+76
| |/ | | | | | | | | | | and add some constness here and there. Change-Id: Ib3caa8310691e8f27aaa1afcfaec0b384513d4f1
* | Merge "Remove legacy omx_message variables"Andy Hung2014-05-071-2/+0
|\ \ | |/ |/|
| * Remove legacy omx_message variablesAndy Hung2014-05-061-2/+0
| | | | | | | | | | | | | | | | | | | | Remove platform_private and data_ptr from omx_message. These were used for legacy deferred buffer creation. See OMXCodec quirks: kDefersOutputBufferAllocation and kRequiresAllocateBufferOnOutputPorts. Change-Id: I94da56bc64f3b46ee1276e93d67b36c1662e2eaf Signed-off-by: Andy Hung <hunga@google.com>
* | MediaFormat owns its stringsMarco Nelissen2014-05-061-2/+4
|/ | | | | | | Have MediaFormat own the strings it returns from toString and getString, reducing the chance of memory leaks. Change-Id: I0ddd593874c8b3af0b7714f2d8a106edf8121108
* 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
| | | | | | | | Change-Id: I9ed6b9c5afb026a1b5fe8b652e75635bbcc223df
* | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-021-1/+22
|/ | | | | Bug: 12134423 Change-Id: I97dc955ee9dd78ace93a7946296d6d9b0e407d43
* 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
| | | | | | | | | | | | This reverts commit 4764324d2704f1b08bb7407014bf203924ff2363. Change-Id: I86d7fcc11423502b73fab2a82af6aa89804f0b76
* | 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
| | | | | | | | | | Bug: 12134423 Change-Id: I1d1be6792b6a4c9f08e042a8b2c89146bde5665e
* | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ↵Lajos Molnar2014-05-021-0/+110
|\ \ | |/ |/| | | | | | | | | ClockEstimator API and WindowedLinearFitEstimator" * commit 'edf6131d1eca1fdff3b151805d241a1cc81b52ca': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| * am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and ↵Lajos Molnar2014-05-021-0/+110
| |\ | | | | | | | | | | | | | | | | | | WindowedLinearFitEstimator" * commit '075c8f6e174e824b6bc95809cc25f1430e9d4e62': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| | * am a69d6f52: Merge "stagefright: add ClockEstimator API and ↵Lajos Molnar2014-05-021-0/+110
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | WindowedLinearFitEstimator" * commit 'a69d6f529239950a8bdf5e4253ea13bb029375cb': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| | | * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-011-0/+110
| | | | | | | | | | | | | | | | Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
| | * | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-294-0/+212
| | |\ \ | | | |/ | | |/|
| | | * am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-251-0/+203
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | | * \ am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b635b0e66b257ab442e230bca96afd5105cf6829': mediaplayer: keep more buffers with the BufferQueue
| | | * \ \ am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" ↵Chong Zhang2014-03-132-0/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c69bc40a347c411751cb082b3eb4a82d976a68ec': Cap pts gap between adjacent frames to specified value
| | | * \ \ \ am 6db20dcb: Merge "AudioTrack: When paused, return cached playback ↵Eric Laurent2014-03-081-0/+1
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" into klp-dev * commit '6db20dcb54dad932a3ea2e3a5dca41fce5802eb4': AudioTrack: When paused, return cached playback position
| | | * \ \ \ \ am 2613347d: Merge "Added support to query ACodec whether adaptive playback ↵Lajos Molnar2014-03-071-0/+3
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is enabled." into klp-dev * commit '2613347d74c3f35bc6fda5df1c29c1119c22d432': Added support to query ACodec whether adaptive playback is enabled.
| | | * \ \ \ \ \ am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-072-6/+18
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af191eb4feac513d17dc0362e0cea5bc9e0ffe9d': Replace size_t in shared memory by uint32_t
| | | * \ \ \ \ \ \ am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-072-4/+4
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01': Make frameworks/av 64-bit compatible
| * | | \ \ \ \ \ \ \ am f131f873: Merge "Add private method NBLog::Reader::dumpLine()"Glenn Kasten2014-04-281-0/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f131f87369ec06fc27fc1f14ea72f0ca1a066509': Add private method NBLog::Reader::dumpLine()
| | * | | | | | | | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-04-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to abstract out fdprintf vs ALOGI so that callers don't need an 'if' at every location. Change-Id: I4c68185fc19f32caeaed93347e6b7d09b8d4c4d8
* | | | | | | | | | | Merge "CameraService: fix race condition and wrong last frame number."Jianing Wei2014-04-171-0/+4
|\ \ \ \ \ \ \ \ \ \ \