summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)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
| | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | CameraService: fix race condition and wrong last frame number.Jianing Wei2014-04-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie2be9a77a0b074497615de38cbb8e8f13b4858ec
* | | | | | | | | | | | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| * | | | | | | | | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| | * | | | | | | | | media: 64 bit compile issuesMark Salyzyn2014-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
| * | | | | | | | | | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-111-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * | | | | | | | | warnings be gone.Andreas Huber2014-04-111-1/+1
| | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | | | | | | | | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-103-8/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of tracking CameraMetadata only, now we track both CameraMetadata and CaptureResultExtras, which is not part of the HAL metadata. This will enable the correct callback of onCaptureStarted and onResultReceived given burst requests. * Get last frame number in reply when submitting requests, canceling requests, and flushing device. For repeating requests, this frame number is the last frame number of the previous request. For non-repeating requests, this frame number is the expected last frame number of the current request. The goal is provide frame number to Java side in order to trigger onCaptureSequenceCompleted correctly. * Fix notifyError so that onDeviceError can be called correctly. Bug: 10749500 Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
* | | | | | | | | | stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added property media.stagefright.log-uri. Set it to true or 1 to log uris by AwesomePlayer. Added utility function to get uri debug string based on incognito and log opt-in status. Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec Related-Bug: 6994761
* | | | | | | | | | stagefright: add AString constructor from String8Lajos Molnar2014-04-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I85b37b6dee4ea9d5f7f1c1a40ff405a01a0c67f1
* | | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-041-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
* | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not signal kWhatShutdownCompleted when moving to Uninitialized state due to receiving a codec error. Do not abort if error happens just before handling a stop request. Bug: 13675112 Change-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b
* | | | | | | | | | | | am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | * commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de': Support CAST V2 Authentication in MediaDrm
| * | | | | | | | | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68d9d71a792deed75d32fe13febc07c9c12c8449': Support CAST V2 Authentication in MediaDrm
| | * | | | | | | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
| * | | | | | | | | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep ↵Lajos Molnar2014-03-281-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more buffers with the BufferQueue"" into klp-dev * commit '1000d426bedb1ec38bdfff98fc8f004b64af13cb': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
| | * | | | | | | | | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers ↵Lajos Molnar2014-03-281-1/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with the BufferQueue"" into klp-dev * commit 'f780d28de2e3cf7f6b26b9626321dba75719736e': DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"
generated by cgit v1.1 at 2024-05-19 06:33:30 +0000