summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* media: Use project pathmapcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Ethan Chen2014-10-036-48/+30
| | | | Change-Id: I8d5d27fd6f23943f290aba5292114a3dfc2cc036
* media: Move sample format tag to frameworkcm-11.0-XNPH44S-bacon-5fa8c79c0bSteve Kondik2014-08-071-1/+0
| | | | Change-Id: Id3081ce8d3079e07343f99463501faa45c5087bf
* QCMetadata: add keys for FLAC meta dataPraveen Chavan2014-07-231-0/+7
| | | | | | Add FLAC meta data specific keys. Change-Id: I85f34d01ad4b403e236a5fc2ebf054eb383abbde
* Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aRicardo Cerqueira2014-06-039-85/+89
|\ | | | | | | | | | | | | | | | | | | | | | | Android 4.4.3 release 1 Conflicts: mm-video-legacy/vidc/vdec.mk mm-video-legacy/vidc/venc.mk mm-video-v4l2/vidc/vdec.mk mm-video-v4l2/vidc/venc.mk Change-Id: I411dbff9a16063e6d9526cbe8fc837b1b61442d2
| * Merge "Move Android.mks to their parent dir." into klp-devYing Wang2014-03-204-40/+42
| |\
| | * Move Android.mks to their parent dir.Ying Wang2014-03-204-40/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So we don't need "../" to reference source files in the common/ directory. "../" in LOCAL_SRC_FILES causes build race condition: the path of object file of ../common/src/extra_data_handler.cpp in vdec actually is the same as the path of object file of ../common/src/extra_data_handler.cpp in venc. Bug: 12779537 Change-Id: Ifd7fef36810c15fbe7854aeb3d505fba63f5d7e2 (cherry picked from commit c9a7bd20d3891b002f6b0285692adb9d246036ae)
| * | Move Android.mks to their parent dir.Ying Wang2014-03-204-31/+32
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | So we don't need "../" to reference source files in the common/ directory. "../" in LOCAL_SRC_FILES causes build race condition: the path of object file of ../common/src/extra_data_handler.cpp in vdec actually is the same as the path of object file of ../common/src/extra_data_handler.cpp in venc. Bug: 12779537 Change-Id: I42bf0471451316dc61f5fafdde5bb1cf1f0218c3 (cherry picked from commit d919cadbcaabc6295c1096c0fa7fa33207fb13d2)
| * mm-video: vidc: fix memory leak in dynamic buffer modeArun Menon2014-03-071-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In dynamic buffer mode, for non-secure playback, output buffer is mapped before each ftb to driver. This buffer is unmapped in the fbd. During flush operations, the mapped buffer in ftb is not freed leading to memory leak. To fix the issue, move the memory mapping to just before sending the ftb to driver. Bug: 11973141 Change-Id: Ib0e5525fdf8132434800bf4d4ff8d27b085fc8fc
* | media: Avoid collision with FFMPEG plugincm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaSteve Kondik2014-05-061-0/+4
| | | | | | | | Change-Id: Ica2cdf9f6572ec18f396d25758cbb2be1359ac0b
* | qcom: fix errors inside ALOGVColin Cross2014-02-181-1/+1
| | | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I3578e2829e64d49c8dd967c8b4ed23ecbdb48a87
* | mm-video: venc: Distinguish between normal NV12 and aligned NV12Deepak Verma2014-01-233-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encoder has a hard-requirement of 2K alignment of UV plane. Apps and other non-camera sources (not aware of this alignment) will queue YUV420SP buffers, which need an explicit alignment. But for some other apps(e.g VT) that are aware that the component wants aligned NV12 and would align it themselves, causing the component to muck up the buffer by realigning it. To prevent the confusion, the component now makes a distinction between NV12 (OMX_COLOR_FormatYUV420SemiPlanar) and aligned NV12 (QOMX_COLOR_\ FORMATYUV420PackedSemiPlanar32). Clients who prefer to provide aligned buffers will now set the latter as the input port format. Change-Id: I73c337660fb825e9b267663266fd4b9d6e35443e Conflicts: mm-core/inc/OMX_QCOMExtns.h mm-video-legacy/vidc/venc/src/omx_video_base.cpp
* | libc2dcolorconvert: Add compatibility with older libc2dRicardo Cerqueira2014-01-231-19/+77
| | | | | | | | | | | | | | | | | | The C2D implementation on Adreno200 either lacks the map/unmap functions, or returns invalid values, so fallback to the direct usage of /dev/kgsl nodes to map GPU memory when the symbols are absent. Change-Id: I243d2ef6f4257bace2c785230d71cd032a5b6a09
* | mm-video-legacy: vdec: display: Change in screenRefresh interfaceJustin Philip2014-01-172-0/+29
| | | | | | | | | | | | | | | | Display interface changed to optimise binder transaction. This change depends on ChangeID I4db66f2427ecf16d7a6264462ae85815217a16b1 Change-Id: I7f7861e2626fdd32efcfe3a2575a62caed91f8db
* | Fix the header-inclusion paths for non-AOSP A and B-family targetsRicardo Cerqueira2014-01-165-0/+26
| | | | | | | | | | | | | | | | AOSP chose to use specific platform names to split the A/B-family implementations of the display HALs, but we support other platforms within the same families. Add support for those. Change-Id: I8a4b9164e04e0fb7128216e56f76b4d96fc1868c
* | vidc: venc: Add support for AVCProfileConstrainedBaselineMaheshwar Ajja2013-12-274-5/+32
| | | | | | | | | | | | | | | | | | | | | | This change adds AVCProfileConstrainedBaseline profile support for H264 encoder. OMX Client can now set this profile to get required profile settings in SPS NAL unit from video component. CRs-Fixed:525412 Change-Id: Id15f620cd3a39b199b2750db92ac1c23bc083c88
* | mm-video: venc: restrict codec level based on target specific macroVikash Garodia2013-12-272-1/+7
| | | | | | | | | | | | | | | | | | | | | | Without this change, call for supported codec levels for different codec profile returned same for different chipset. The change will now return different codec levels supported for different chipset.This change will fix CTS case. Change-Id: I2da19265b5b9360aae363b2b43fe83b8f007fc96 CRs-Fixed: 572716
* | media: fix msm8660 omx issuesyhost2013-12-134-4/+6
| | | | | | | | | | | | for msm8660: previous code lost libOmxVdec.so & libOmxVenc.so , now fixed it! Change-Id: Ie6db1be912f0411bca47e9bfba9d0b7053febb18
* | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-064-37/+197
|\| | | | | | | Android 4.4.1 Release 1
| * mm-video: vidc: venc: add set ctrl to request sequence headerArun Menon2013-11-121-1/+12
| | | | | | | | | | | | | | | | | | | | | | The omx component can explicitly request for sequence header using the set ctrl id - V4L2_CID_MPEG_VIDC_VIDEO_REQUEST_SEQ_HEADER. The omx component should not rely on the driver to send sequence header on it's own. b/11051201 Change-Id: Ie5c2adc11c15b84a7f659d75357a09b7758ea199
| * mm-video: venc: switch between executing and loaded.Arun Menon2013-11-122-1/+37
| | | | | | | | | | | | | | | | | | | | when the v4l2 modules stopped, it will free all output and input buffers. So when it is re-started again, re-do the VIDIOC_REQBUFS command again. b/11051201 Signed-off: Kim Zhang<xiazhang@codeaurora.org> Change-Id: I7c6de237fdd7476ca4ebc7d1f1016e86f3af9d95
| * mm-video: vidc: release registered buffers from driverArun Menon2013-11-121-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | In some scenarios, component may restart from loaded to idle state in the same context and it is resulting in the preapare buf failure as previous buffers are not unregistered. Unregister the buffers from driver while stopping the component. b/11051201 Signed-off: Manikanta Kanamarlapudi<kmanikan@codeaurora.org> Change-Id: I048cf715d2e83b05df99eaf10776cff0bbb2acd2
| * merge in release branch changes (no-op).Ed Heyl2013-11-080-0/+0
| |\
| | * mm-video: vidc: stability fixes in decoderPraveen Chavan2013-11-012-24/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize access to extradata buffer which is allocated and accessed in separate threads. Do not unmap output handles in dynamic buffer mode when buffers are freed (since they are unmapped already in FBD) Bug: 11099331 Bug: 11366221 Signed-off: Leena Winterrowd <lenhardw@codeaurora.org> Change-Id: I26d02c183d8496a52d4ded51c53f44eaf5e6e0b0
| | * mm-video: vidc: Fix codec config behavior in flushPraveen Chavan2013-11-012-9/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send pending codec config data to the driver when flushing. Reset intermediate buffers handles when input port is disabled and port buffers are freed. Bug: 11099331 Signed-off: Leena Winterrowd <lenhardw@codeaurora.org> Change-Id: Ifd674b71ce04a4be16b564c53122ce5c5e4d92f1
| * | mm-video: vidc: stability fixes in decoderPraveen Chavan2013-11-012-24/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Synchronize access to extradata buffer which is allocated and accessed in separate threads. Do not unmap output handles in dynamic buffer mode when buffers are freed (since they are unmapped already in FBD) Bug: 11099331 Bug: 11366221 Signed-off: Leena Winterrowd <lenhardw@codeaurora.org> Change-Id: I26d02c183d8496a52d4ded51c53f44eaf5e6e0b0
| * | mm-video: vidc: Fix codec config behavior in flushPraveen Chavan2013-11-012-9/+60
| |/ | | | | | | | | | | | | | | | | | | | | Send pending codec config data to the driver when flushing. Reset intermediate buffers handles when input port is disabled and port buffers are freed. Bug: 11099331 Signed-off: Leena Winterrowd <lenhardw@codeaurora.org> Change-Id: Ifd674b71ce04a4be16b564c53122ce5c5e4d92f1
| * Merge "mm-video: venc: allocate input buffers as uncached" into klp-devVineeta Srivastava2013-10-171-1/+1
| |\
| | * mm-video: venc: allocate input buffers as uncachedPraveen Chavan2013-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | YUV data written by CPU producers (MediaCodec apps) are not Bug: 10192531 Change-Id: I1975b9b63ad4af474340ac366af32c8c3863b4bb
| * | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ | | |/ | |/|
* | | mm-video: venc: Correct a typo in variable nameDeepak Verma2013-11-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A kernel variable was to be defined as unsigned long but it is mistakenly defined as unsigned only, the space is missing after long. This bug is silent because unsigned is also a valid data type by itself. Corresponding to kernel fix, similar correction is done in userspace code. Change-Id: Ie58f275149dc9c85553f75e02594113b1a03ddcf CRs-fixed: 556771
* | | QCMetaData: Add key for interlaceRiaz Rahaman2013-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | key for interlace set in metadata is being used for thumbnail mode. If the key is set, two ETB are send to the decoder Change-Id: I1e4e996f46f022916ab5f4f14ff2c111f04717c1
* | | Use actual kernel headers and display-caf paths if defineddhacker292013-11-228-52/+121
| | | | | | | | | | | | Change-Id: I7338867f6eb4d88b33b610a2b2f93280ed6e71bc
* | | media: Only build when no variant is setSteve Kondik2013-11-011-0/+4
| | | | | | | | | | | | Change-Id: I4363e0c9163050932a52711d080b0957e1d5925c
* | | mm-video: venc: allocate input buffers as uncachedPraveen Chavan2013-10-171-1/+1
| |/ |/| | | | | | | | | | | | | YUV data written by CPU producers (MediaCodec apps) are not Bug: 10192531 Change-Id: I1975b9b63ad4af474340ac366af32c8c3863b4bb
* | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-130-0/+0
|\ \ | |/ |/|
| * mm-video: set gralloc metadata only if handle is validPraveen Chavan2013-10-091-6/+12
| | | | | | | | | | | | | | | | | | | | In case of dynamic buffering, pre-registered gralloc handles are not initialized. Check for handles before setting metadata to remove log spam due to null checks b/11021437 Change-Id: I4a9c79ba27cb09f564b3322b5f7e0748997baf7b
| * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| |\
| | * mm-video: venc: fix corner case with 'handle zero-length invalid EOS buffers'Praveen Chavan2013-10-041-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When queueing a color-conversion buffer in place of an invalid EOS buffer, we may have run out of conversion buffers. Wait for a color-conversion buffer to be returned by the encoder Bug: 11070246 Change-Id: I99f963b342b98b44a78f38705e2bfc449b2cbc4e
| | * mm-video: vidc: disable extra data for vp8Arun Menon2013-10-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Firmware does not support extra data for vp8 and reports zero bytes requirement. So OMX component does not allocate any extra data buffer. However firmware asserts when extra data is enabled but extra data buffer is NULL. With this change, firmware should not assert. Change-Id: I6d0278cd3ccd63c960edcf40510a31263bea629f
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | |\
* | | | | mm-video: support adaptive playback modePraveen Chavan2013-10-123-21/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this mode client checks and sets an extension to indicate that the content can change resolutuion, within the pre- announced maximum height/width. Component overallocates buffers for the max resolution and dbp, and notifies client of any crop change when resolution changes within bounds. Reoslution changes beyond set max width/height will result in port-reconfiguration notification, while adapting to the new resolution Bug: 10192531 Ack-ed by Deepak Verma <dverma@codeaurora.org> Change-Id: I3e4deb10b3fe89398ee0ddc3a0f46d5fc22feab8
* | | | | Merge "mm-video: set gralloc metadata only if handle is valid" into klp-devVineeta Srivastava2013-10-091-6/+12
|\ \ \ \ \
| * | | | | mm-video: set gralloc metadata only if handle is validPraveen Chavan2013-10-091-6/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of dynamic buffering, pre-registered gralloc handles are not initialized. Check for handles before setting metadata to remove log spam due to null checks b/11021437 Change-Id: I4a9c79ba27cb09f564b3322b5f7e0748997baf7b
* | | | | merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
|\ \ \ \ \
| * | | | | mm-video: vidc: Fix frameparser behavior on EOS with dataPraveen Chavan2013-09-171-30/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The frameparser currently holds back any bytes that may be part of the next frame's start code. In general, this results in frames ending in 0x00 or 0x00,0x00 being marked as partial and properly flushed on the next parse_sc_frame call. If an EOS is received with data, this flush never occurs. In that case, this change copies the missing bytes to the destination frame. author: Leena Winterrowd <lenhardw@codeaurora.org> Bug: 10668205 Change-Id: Ia7f1d795b2459da86f1bf6cdb5f8ca8e21c306bd
| * | | | | mm-video: Free frame_parser in component de-initPraveen Chavan2013-09-171-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frame_parser is alloc'ed in component init, it should be accordingly freed in de-init rather than when input buffers are freed. author: Leena Winterrowd <lenhardw@codeaurora.org> Bug: 10668205 Change-Id: I2a8dd90b4831f9d9e7d50f5a1093d1a0055d3aad
| * | | | | mm-video: vidc: Flush m_input_free_q when input buffers are freedPraveen Chavan2013-09-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not flushing it can leave dangling pointers to old input buffers, which get dereferenced if the component is re-used for another session. author: Deva Ramasubramanian <dramasub@codeaurora.org> bug: 10668205 Change-Id: I8356c7db9714d1c1d420d975aed0a7f50cdedef7
* | | | | | merge in KQS81MEd Heyl2013-10-080-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| |\ \ \ \