Commit Graph

86 Commits

Author SHA1 Message Date
Lajos Molnar
b1f94ef3f9 Merge "media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams" into klp-dev 2013-10-03 16:10:25 +00:00
Chong Zhang
b344adf089 HDCP: add getCaps to query HDCP module capabilities
This is used now to query whether HDCP module supports encryption
from a native buffer output from the encoder.

Bug: 10609422

Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
2013-09-07 23:33:50 -07:00
Chong Zhang
a3a918557d HDCP: add enums for HDCP module capabilities
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
2013-09-04 11:38:43 -07:00
Jeff Tinker
611d3d4816 Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: I6666d0dbfdc6e791deb9a82c918255af4fa19816
2013-08-21 16:00:06 -07:00
Lajos Molnar
dde86f7b18 media/hardware/HardwareAPI.h: Added PrepareForAdaptivePlaybackParams
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
2013-08-12 12:56:08 -07:00
Lajos Molnar
5f39f6043d Clarify some android-specific OMX extensions for native buffers.
Clarify the use of enableAndroidNativeBuffers and
storeMetaDataInBuffers extensions.

Change-Id: Ia1ca4a262525de74f133619f92ef6ba8271a6f72
Signed-off-by: Lajos Molnar <lajos@google.com>
2013-07-17 15:12:27 -07:00
Lajos Molnar
bfc41519ce Merge "Add video extension OMX_VIDEO_CodingVP9 to support VP9 decoder." 2013-06-25 22:07:39 +00:00
Andreas Huber
00e595f10f Fix includes in HardwareAPI.h to be absolute and not relative
(but using system header syntax)

Change-Id: I504c5c5330ddd1e3b3d2fb4760b0235a4fda84d8
2013-06-25 10:08:42 -07:00
hkuang
5195e0808b Add video extension OMX_VIDEO_CodingVP9 to support VP9 decoder.
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
2013-06-24 13:45:15 -07:00
Lajos Molnar
07d93d197a media/hardware/HardwareAPI.h: Added metadata struct used by video decoder
This is the metadata layout when used by the video decoder.

Change-Id: I3497305ad23b3fc4e1e8eaaea7b0890bc1ffd5ad
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 7093648
2013-06-21 12:05:39 -07:00
Chong Zhang
685e68130b wifi-display: add support for metadata mode on encoder output
Bug: 8968123

Change-Id: I3d2b567d4908f5f49c0694589920babe1f6752cd
2013-05-16 15:58:31 -07:00
Jeff Tinker
dc1b01141f am 2c228354: am b84d1cad: Correct native API documentation related to MediaDrm offline use case
* commit '2c2283549c72184145c9f030bbfe6124ee75d169':
  Correct native API documentation related to MediaDrm offline use case
2013-05-08 15:03:40 -07:00
Jeff Tinker
b84d1cad1d Correct native API documentation related to MediaDrm offline use case
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
2013-05-07 15:16:40 -07:00
Rom Lemarchand
1bc7e2f6dd Add support for OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m color format
Change-Id: I9392eb961ec92d4d778573b7a142344e552c80d6
2013-04-11 10:30:27 -07:00
Jeff Tinker
7eafcae5ff Implement async event callout from drm plugin to Java app
Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
2013-04-03 12:02:59 -07:00
Jeff Tinker
bcbd78bd24 MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.

Change-Id: I418ffbb37e3036a2b5eea5a86ac88a5af1a9da07
2013-04-01 22:01:10 -07:00
Jeff Tinker
56c78c47d8 Updated MediaDrm API based on review input.
Change-Id: I06716d2616bbe7efaea6cbf9ba7bf303dfae1650
2013-03-13 13:35:36 -07:00
Kunter Gultekin
203f89a75a Adds some OpenMAX 1.1.2 IL extension headers.
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>
2013-02-07 12:16:05 -08:00
Andreas Huber
0dcde5213b Extend the HDCP API to also allow for a _decryption_ module, the counterpart
to what we previously defined exclusively.

Change-Id: I774d3cd7146da77675dcb90e33c9552cb7b10ac6
2013-01-30 10:40:28 -08:00
Marco Nelissen
62b40b3535 Add new format constant
Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf
2013-01-17 09:18:29 -08:00
Jeff Tinker
8ab80a2d71 Add DRM Client API header files for DASH support
Change-Id: Ia4cdcbe193d087d33e2ee91e6f5364cbcc237554
2012-12-19 16:34:37 -08:00
Andreas Huber
7682a9c35a Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
Change-Id: I71ce254533c8e99bc54d199d8a9828397fe3d99d
related-to-bug: 7245308
2012-09-28 11:33:17 -07:00
Deva Ramasubramanian
dbaaa38882 frameworks/native: Amend HDCP API
- 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>
2012-09-19 11:17:36 -07:00
Andreas Huber
a8fc772b5b initial checkin of a preliminary HDCP API for vendors to implement.
Change-Id: If98277efdec1bc8f1e9f4af1ca73324e4c3d469b
2012-08-29 13:26:55 -07:00
Ed Heyl
747c480b0e Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev
Conflicts:
	include/media/hardware/CryptoAPI.h

Change-Id: I84bf34edbef000558f088bbf1d1e5b55d6217d2e
2012-07-28 09:55:54 -07:00
Edwin Wong
e64a403552 Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36

Change-Id: Ic2a28663d25e3007c95e15ecbb0d44b820045f85
related-to-bug: 6732061
2012-07-17 15:17:02 -07:00
Edwin Wong
e0daeb3933 Fixed sample video corrupted in MediaCodec mode.
Change-Id: Ibe11a83199f3db1ba6266a1a9e11c7fc24ceb554
related-to-bug: 6732061
2012-07-13 11:34:10 -07:00
Haynes Mathew George
07912f5093 Add vendor specific color format to OMX_IVCommon.h
- Add Qualcomm specific color format to OMX_IVCommon.h

Change-Id: I77a7196307d079348a50d7bb67c80cd2642a72df
2012-06-21 15:26:38 -07:00
Jean-Michel Trivi
224c78405f OMX IL header additions for FLAC
Bug 5525503

Change-Id: I8d305d5351d3780f8ca933b8e602f2bf88e9ac78
2012-05-09 16:35:50 -07:00
Dave Burke
8e846fd6b3 Define OMX_AUDIO_AACObjectELD
Change-Id: Icfbcbddb46fc0bf185e00b193462bc9e035c222b
2012-04-25 22:04:04 -07:00
Andreas Huber
383190e475 Allow the crypto plugin to specify error detail if it returns an error
in the range ERROR_DRM_VENDOR_MIN..ERROR_DRM_VENDOR_MAX.

Change-Id: Ic5d53e98cf6d98d92ad305d51f848e03d0bf3a84
related-to-bug: 6365261
2012-04-19 13:49:56 -07:00
Andreas Huber
cf0db31c32 New Crypto "HAL" API.
Change-Id: I225cdfeffb7663a2d639a01cfe704aa12f9014b8
related-to-bug: 6275919
2012-04-03 14:15:05 -07:00
Andreas Huber
599ebfd48d Remove all traces of long obsolete OMXComponentBase class.
Change-Id: I749994fe1560363afc95beae45b66ea56a20caa8
2012-03-16 09:00:53 -07:00
James Dong
9f70b92f1b Copy one more file to /frameworks/native
o related-to-bug: 6044887

Change-Id: I920c487089eb258ada87603134f2597db6fe14e9
2012-03-12 18:55:13 -07:00
James Dong
334de520b0 Copied some headers from /frameworks/base to /frameworks/native to support PDK effort
o added some minor header include changes
o related-to-bug: 6044887

Change-Id: Ia8e7ba861c509a4fb688ab2ed1e81151a708861a
2012-03-12 12:48:46 -07:00
James Dong
e936584ac1 Move II420ColorConverter.h to /frameworks/native/include/media/editor
o related-to-bug: 6044894

Change-Id: Ib8f5406e32bd6c190d65e4a2e014f73e759d4415
2012-03-12 10:59:55 -07:00