summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | AArch64: Correction to OMX_U32 and OMX_S32Marcus Oakland2014-04-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The types of OMX_U32 and OMX_S32 were appropriate to a 32-bit system but were not appropriate to a 64-bit system. They have been changed to make them portable between the two systems. With this change and a change to frameworks/av/media/libstagefright/foundation/AString.cpp, the android.media.cts.DecoderTest#testFlush CTS test passes. Change-Id: I8e16c7169f54599c23fea71585b531e48541c78a Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | | | am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" ↵Jeff Tinker2014-04-011-2/+15
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | into klp-modular-dev * commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b': Support CAST V2 Authentication in MediaDrm
| * | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: Ic38f0e1484b1388dd87f4591c74984cb724d50e2 related-to-bug: 12702350
| * | [DO NOT MERGE] Extend OpenMAX IL definitions to support AC3Changwan Ryu2014-02-032-0/+63
| |/ | | | | | | | | | | | | | | OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above supports component extension APIs, which enable us to add our own constants and definitions. Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3
* | Adding Opus related struct definitions to OMX_IndexVignesh Venkatasubramanian2014-03-032-0/+16
| | | | | | | | | | | | | | Adding Opus related structure and constant definitions to OMX_Index.h Change-Id: Iae0394c86900f0db322893ffce695f854624833a
* | Extend OpenMAX IL definitions to support AC3Changwan Ryu2013-11-062-0/+63
| | | | | | | | | | | | | | | | OpenMAX IL does not have generic support for AC3, but IL 1.1.2 and above supports component extension APIs, which enable us to add our own constants and definitions. Change-Id: Iecee4f8bb3112b0720ceae9192017e12d3fe97e3
* | am 04e6ab6e: am b1f94ef3: Merge "media/hardware/HardwareAPI.h: Added ↵Lajos Molnar2013-10-041-0/+25
|\ \ | |/ | | | | | | | | | | PrepareForAdaptivePlaybackParams" into klp-dev * commit '04e6ab6e27c39604a7029467161a90af78ecdf07': media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
| * Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" ↵Lajos Molnar2013-10-031-0/+25
| |\ | | | | | | | | | into klp-dev
| | * media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParamsLajos Molnar2013-08-121-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the param struct used by stagefright to notify codec that the playback may include resolution changes, so that it can prepare accordingly to avoid port reconfiguration. Change-Id: I64e53b7ebf74c4f9d07cc9fe0cd65be55f666afe Signed-off-by: Lajos Molnar <lajos@google.com> Related-to-bug: 7093648
* | | HDCP: add getCaps to query HDCP module capabilitiesChong Zhang2013-09-071-0/+5
|/ / | | | | | | | | | | | | | | | | This is used now to query whether HDCP module supports encryption from a native buffer output from the encoder. Bug: 10609422 Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
* | HDCP: add enums for HDCP module capabilitiesChong Zhang2013-09-041-0/+13
| | | | | | | | | | | | | | | | | | | | This change adds the enums for HDCP caps. An interface getCaps() will be added later for querying whether HDCP module supports encryption from a native buffer output from the encoder. Bug: 10609422 Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
* | Add ability to test supported content types to MediaDrmJeff Tinker2013-08-211-0/+5
|/ | | | | bug: 10244066 Change-Id: I6666d0dbfdc6e791deb9a82c918255af4fa19816
* Clarify some android-specific OMX extensions for native buffers.Lajos Molnar2013-07-171-4/+12
| | | | | | | | Clarify the use of enableAndroidNativeBuffers and storeMetaDataInBuffers extensions. Change-Id: Ia1ca4a262525de74f133619f92ef6ba8271a6f72 Signed-off-by: Lajos Molnar <lajos@google.com>
* Merge "Add video extension OMX_VIDEO_CodingVP9 to support VP9 decoder."Lajos Molnar2013-06-252-7/+2
|\
| * Add video extension OMX_VIDEO_CodingVP9 to support VP9 decoder.hkuang2013-06-242-7/+2
| | | | | | | | | | | | | | | | | | | | | | Change OMX_Video_CodingVPX to OMX_VIDEO_CodingVP8 in order to be consistant with official OMX_VideoExt.h and avoid the confusion with new extension OMX_VIDEO_CodingVP9. This change needs to be merged with changes in frameworks/av to avoid build break due to header change. Change-Id: Iaa2dbafa76dc24ad3cf52a9bf3dee312e3c64bfa
* | Fix includes in HardwareAPI.h to be absolute and not relativeAndreas Huber2013-06-251-2/+2
| | | | | | | | | | | | (but using system header syntax) Change-Id: I504c5c5330ddd1e3b3d2fb4760b0235a4fda84d8
* | media/hardware/HardwareAPI.h: Added metadata struct used by video decoderLajos Molnar2013-06-211-0/+8
|/ | | | | | | | This is the metadata layout when used by the video decoder. Change-Id: I3497305ad23b3fc4e1e8eaaea7b0890bc1ffd5ad Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 7093648
* wifi-display: add support for metadata mode on encoder outputChong Zhang2013-05-161-0/+15
| | | | | | Bug: 8968123 Change-Id: I3d2b567d4908f5f49c0694589920babe1f6752cd
* am 2c228354: am b84d1cad: Correct native API documentation related to ↵Jeff Tinker2013-05-081-11/+33
|\ | | | | | | | | | | | | MediaDrm offline use case * commit '2c2283549c72184145c9f030bbfe6124ee75d169': Correct native API documentation related to MediaDrm offline use case
| * Correct native API documentation related to MediaDrm offline use caseJeff Tinker2013-05-071-11/+33
| | | | | | | | | | | | | | | | These doc updates were made previously to the java API but some did not make it into the native API. Change-Id: I9b7bfcd77bc593685254baca1c148deb7e1f91c7 related-to-bug: 8621588
* | Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color formatRom Lemarchand2013-04-111-0/+1
|/ | | | Change-Id: I9392eb961ec92d4d778573b7a142344e552c80d6
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-3/+39
| | | | Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
* MediaDrm API updateJeff Tinker2013-04-011-33/+100
| | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: I418ffbb37e3036a2b5eea5a86ac88a5af1a9da07
* Updated MediaDrm API based on review input.Jeff Tinker2013-03-133-194/+205
| | | | Change-Id: I06716d2616bbe7efaea6cbf9ba7bf303dfae1650
* Adds some OpenMAX 1.1.2 IL extension headers.Kunter Gultekin2013-02-072-0/+213
| | | | | | | | | | | | | | | | | Includes index and video extension headers in order to support vpx specific parameters and enable vpx encoder. Note that existing (seemingly modified) version of OMX_Video.h semantically conflicts with official OMX_VideoExt.h because former includes OMX_Video_CodingVPX as OMX_VIDEO_CODINGTYPE whereas official extension headers denote it as OMX_VIDEO_CodingVP8 within OMX_VIDEO_CODINGEXTTYPE. Change-Id: Ibab9663fcbc9c406a2cfb4bf79fe21e3b01a6e66 Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
* Extend the HDCP API to also allow for a _decryption_ module, the counterpartAndreas Huber2013-01-301-10/+47
| | | | | | to what we previously defined exclusively. Change-Id: I774d3cd7146da77675dcb90e33c9552cb7b10ac6
* Add new format constantMarco Nelissen2013-01-171-0/+1
| | | | Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf
* Add DRM Client API header files for DASH supportJeff Tinker2012-12-192-0/+194
| | | | Change-Id: Ia4cdcbe193d087d33e2ee91e6f5364cbcc237554
* Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.Andreas Huber2012-09-281-0/+10
| | | | | Change-Id: I71ce254533c8e99bc54d199d8a9828397fe3d99d related-to-bug: 7245308
* frameworks/native: Amend HDCP APIDeva Ramasubramanian2012-09-191-4/+13
| | | | | | | | - Allow caller to set the observer and cookie. - Add more notifications that the HDCPModule can send to its Observer. Change-Id: I8bf9cc02a029cd38bbd25d9f0a634452173f4d26 Signed-off-by: Deva Ramasubramanian <dramasub@codeaurora.org>
* initial checkin of a preliminary HDCP API for vendors to implement.Andreas Huber2012-08-291-0/+85
| | | | Change-Id: If98277efdec1bc8f1e9f4af1ca73324e4c3d469b
* Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-devEd Heyl2012-07-281-0/+1
|\ | | | | | | | | | | | | Conflicts: include/media/hardware/CryptoAPI.h Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
| * Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGEEdwin Wong2012-07-171-1/+1
| | | | | | | | | | | | | | jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36 Change-Id: Ic2a28663d25e3007c95e15ecbb0d44b820045f85 related-to-bug: 6732061
| * Add vendor specific color format to OMX_IVCommon.hHaynes Mathew George2012-06-211-0/+1
| | | | | | | | | | | | - Add Qualcomm specific color format to OMX_IVCommon.h Change-Id: I77a7196307d079348a50d7bb67c80cd2642a72df
* | Fixed sample video corrupted in MediaCodec mode.Edwin Wong2012-07-131-1/+3
|/ | | | | Change-Id: Ibe11a83199f3db1ba6266a1a9e11c7fc24ceb554 related-to-bug: 6732061
* OMX IL header additions for FLACJean-Michel Trivi2012-05-092-0/+15
| | | | | | Bug 5525503 Change-Id: I8d305d5351d3780f8ca933b8e602f2bf88e9ac78
* Define OMX_AUDIO_AACObjectELDDave Burke2012-04-251-2/+2
| | | | Change-Id: Icfbcbddb46fc0bf185e00b193462bc9e035c222b
* Allow the crypto plugin to specify error detail if it returns an errorAndreas Huber2012-04-191-1/+9
| | | | | | | in the range ERROR_DRM_VENDOR_MIN..ERROR_DRM_VENDOR_MAX. Change-Id: Ic5d53e98cf6d98d92ad305d51f848e03d0bf3a84 related-to-bug: 6365261
* New Crypto "HAL" API.Andreas Huber2012-04-031-0/+86
| | | | | Change-Id: I225cdfeffb7663a2d639a01cfe704aa12f9014b8 related-to-bug: 6275919
* Remove all traces of long obsolete OMXComponentBase class.Andreas Huber2012-03-161-2/+0
| | | | Change-Id: I749994fe1560363afc95beae45b66ea56a20caa8
* Copy one more file to /frameworks/nativeJames Dong2012-03-121-0/+94
| | | | | | o related-to-bug: 6044887 Change-Id: I920c487089eb258ada87603134f2597db6fe14e9
* Copied some headers from /frameworks/base to /frameworks/native to support ↵James Dong2012-03-1212-0/+7122
| | | | | | | | | PDK effort o added some minor header include changes o related-to-bug: 6044887 Change-Id: Ia8e7ba861c509a4fb688ab2ed1e81151a708861a
* Move II420ColorConverter.h to /frameworks/native/include/media/editorJames Dong2012-03-121-0/+126
o related-to-bug: 6044894 Change-Id: Ib8f5406e32bd6c190d65e4a2e014f73e759d4415