summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx
Commit message (Collapse)AuthorAgeFilesLines
* Update OMX messages for 64 bitAndy Hung2014-05-142-25/+95
| | | | | | | | | 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>
* 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>
* Merge "BufferQueue: Increase max slots from 32 to 64"Dan Stoza2014-04-211-3/+5
|\
| * BufferQueue: Increase max slots from 32 to 64Dan Stoza2014-04-111-3/+5
| | | | | | | | | | | | | | | | Increases NUM_BUFFER_SLOTS from 32 to 64 and changes the mask returned by IGBC::getReleasedBuffers from 32 to 64 bits. Bug: 13174352 Change-Id: I1c41256ffbc30abcf9f7b0b5fcf53da40462da28
* | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-153-4/+10
|\ \ | |/ |/| | | | | | | * 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-153-4/+10
| |\ | | | | | | | | | | | | | | | * commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| | * media: 64 bit compile issuesMark Salyzyn2014-04-153-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | - 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-114-31/+31
| |\ \ | | |/ | | | | | | | | | * commit '52a861d2825544fe2eb90f8e5f6351d02ff95536': warnings be gone.
| | * warnings be gone.Andreas Huber2014-04-114-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | (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
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-04-042-21/+24
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-122-21/+24
| | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: I1a824d09ce582ee54753683d30cdc23813c13b6b
* | | | am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for ↵Glenn Kasten2014-03-181-0/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | libstagefright/ subdirectories" * commit '098b28fc88b3d96eada2f9db318d9c38c70cf674': More precise 32-bit only for libstagefright/ subdirectories
| * | am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-181-0/+2
| |\ \ | | |/ | | | | | | | | | * commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c': More precise 32-bit only for libstagefright/ subdirectories
| | * More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-171-0/+2
| | | | | | | | | | | | Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
| * | am bd77a1b5: am cf49a51f: fix codec buffer leak in error handling when ↵Chong Zhang2014-03-131-7/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | timestamp goes backward * commit 'bd77a1b5115d355eb1e2bc270fe9aa4ceb3d8e65': fix codec buffer leak in error handling when timestamp goes backward
| | * | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-03-111-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't touch codec buffer if we decided to drop a frame with bad pts Bug: 11971963 Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6 (cherry picked from commit b63d2433350d56bda9f3477549086c90bb6d535e)
| * | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to ↵Chong Zhang2014-03-133-5/+146
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | specified value" into klp-dev * commit 'a671f943b72155460f0c94cdd92d829cb059b571': Cap pts gap between adjacent frames to specified value
| | * | Merge "Cap pts gap between adjacent frames to specified value" into klp-devChong Zhang2014-03-113-5/+146
| | |\ \
| | | * | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-113-5/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In the scenario of cast mirroring, encoding could be suspended for prolonged periods. Limiting the pts gap to workaround the problem where encoder's rate control logic produces huge frames after a long period of suspension. - Repeat last frame a couple more times to get better quality on static scenes. - Fix the timestamp on repeat frames (it was not set) Bug: 11971963 Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7 (cherry picked from commit 94ee4b708acfa941581160b267afb79192b1d816)
| * | | | am 1e001f92: am 1c608ab3: save mGraphicBuffer pointer even when we\'re suspendedChong Zhang2014-03-131-0/+6
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | * commit '1e001f92e748de00a3e20effa464d59d75a746b3': save mGraphicBuffer pointer even when we're suspended
| | * | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-03-111-0/+6
| | |/ | | | | | | | | | | | | | | | Bug: 12609966 Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37 (cherry picked from commit 49270665e7a20cd120724fc388da8b166ff0b4f1)
* | | Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListenersJesse Hall2014-03-072-0/+10
| | | | | | | | | | | | Change-Id: I94384aefd47b3a581cbdc3905ba9fdbc88d3d06c
* | | Merge "Opus Matroska support in OpenMax"Lajos Molnar2014-03-042-0/+3
|\ \ \
| * | | Opus Matroska support in OpenMaxVignesh Venkatasubramanian2014-03-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding Openmax component for libopus software decoder. This can decode opus audio files embedded in matroska containers. Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc Note: This CL is part of adding Opus support to Android.
* | | | Merge "support for time lapse/slow motion when using SURFACE source"Chong Zhang2014-02-223-4/+64
|\ \ \ \ | |/ / / |/| | |
| * | | support for time lapse/slow motion when using SURFACE sourceChong Zhang2014-02-143-4/+64
| | | | | | | | | | | | | | | | | | | | Bug: 13032650 Change-Id: Iecbadf9f29c8c49353416fc467fb3acdde279595
* | | | Merge "fix codec buffer leak in error handling when timestamp goes backward"Chong Zhang2014-02-191-7/+7
|\ \ \ \ | |/ / /
| * | | fix codec buffer leak in error handling when timestamp goes backwardChong Zhang2014-02-141-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't touch codec buffer if we decided to drop a frame with bad pts Bug: 11971963 Change-Id: I9b4c56210f64258f1be257b14184381a1133e0d6
* | | | fix the OS X builds until we can fix compiler warnings that apparentlyAndreas Huber2014-02-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | trigger only on that platform... Change-Id: I9555d7e2efbe3e349e8af60528b7b9d131a257e3
* | | | warnings be gone.Andreas Huber2014-02-117-32/+36
|/ / / | | | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-112-4/+5
|\ \ \ | |/ / | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-112-4/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-053-4/+39
| | | | | | | | | | Bug: 12305192 Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
* | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-051-1/+3
|\ \ | | | | | | | | | available to media code"
| * | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-1/+3
| | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-01-303-5/+146
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In the scenario of cast mirroring, encoding could be suspended for prolonged periods. Limiting the pts gap to workaround the problem where encoder's rate control logic produces huge frames after a long period of suspension. - Repeat last frame a couple more times to get better quality on static scenes. - Fix the timestamp on repeat frames (it was not set) Bug: 11971963 Change-Id: I1d68ab3d269874bf3921aa429a985c5f63e428c7
* | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-01-281-0/+6
|/ | | | | Bug: 12609966 Change-Id: Ifd41fd973876da69039113fcaeacdccf39472b37
* Back to the old way of making sure that no more buffers are submittedAndreas Huber2013-11-081-2/+4
| | | | | | | to the component while in executing->idle state. Change-Id: Ia207f0a112025ed0e2c4d62f404afbbfa694cbab related-to-bug: 11557463, 11573543
* Merge "Properly handle executing->idle in GraphicBufferSource" into klp-devAndreas Huber2013-11-083-7/+29
|\
| * Properly handle executing->idle in GraphicBufferSourceAndreas Huber2013-11-073-7/+29
| | | | | | | | | | | | | | | | | | | | ACodec has initiated the transition from exectuing->idle and is waiting for the component to return all buffers so they can be freed. It's counter productive and with some vendors harmful to submit additional buffers to the component from this point on. Change-Id: I332be254a1faf94902c77b5792a373ab447e44d3 related-to-bug: 11573543
* | Replace assert with error messageAndy McFadden2013-11-071-1/+6
|/ | | | | | | | | | | | | The failure happens when vendor code sends EMPTY_BUFFER_DONE twice on the same buffer. The second time through, we see a slot that has already been emptied, and get very confused. This should be handled with an error, not an assertion, so we now log a stern complaint and carry on. Bug 11557463 Change-Id: I76e53ff08924bca81afb6980df8e59a6012ff8fe
* Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
| | | | | | | | | Repeating the most-recent buffer appears to fail when the producer disconnects. This adds a NULL check to avoid crashing. Bug 10607920 Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
* IOMX: Add prepareForAdaptivePlayback methodLajos Molnar2013-10-032-0/+41
| | | | | | | | | | | | | prepareForAdaptivePlayback is the fallback mechanism to support seamless resolution change for devices that do not support dynamic output buffers. It is up to the codecs to handle this appropriately, but codecs that do not handle dynamic output buffers would request enough buffers up to the requested size in this method to avoid port reconfiguration on resolution changes. Change-Id: I58d4aa8ef1359ea3472735bbe9140c3132039b3d Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10192531 Related-to-bug: 7093648
* Optionally repeat the previously submitted frame to the encoderAndreas Huber2013-08-133-8/+218
| | | | | | | if no new frame has been delivered by surface flinger within the timeout interval. Change-Id: I282f1b726dfe5646b178d7858d6f5d4f5a264fde
* Merge "IOMX: add updateGraphicBufferInMeta method for metadata mode"Lajos Molnar2013-08-062-0/+27
|\
| * IOMX: add updateGraphicBufferInMeta method for metadata modeLajos Molnar2013-08-062-0/+27
| | | | | | | | | | | | | | | | | | This is used to set the handle in the metadata buffer that is valid in the mediaserver process, as well as to keep a reference for the graphic buffers in BufferMeta. Change-Id: I46bb68d8bed894f357eeeb25368360d11b276634 Signed-off-by: Lajos Molnar <lajos@google.com>
* | fix fallout from binderizing BufferQueues consumer sideMathias Agopian2013-08-011-5/+2
|/ | | | Change-Id: I626bac6df4fc3d8478046193f06ecc7ea60dd3a8
* Update error messageAndy McFadden2013-07-241-1/+2
| | | | | | | | The color format used for surfaces has two different names. The one in the error message is the "native" name, which doesn't mean anything to external developers. Change-Id: Ic0561f4ad12970b0e0a60bd17b4e3997af1a9f0e
* Don't abort on unusual state transitionAndy McFadden2013-07-231-3/+5
| | | | | | | | | The state transition check was too strict, and we were crashing mediaserver inappropriately. Bug 9819944 Change-Id: I1482ed1cfee37088d4893ee81cf1b2b950d2e930
* Merge "update to new Consumer APIs"Mathias Agopian2013-07-201-5/+4
|\