Commit graph

193 commits

Author SHA1 Message Date
Jiyong Park
55e9bd7c48 Package media/*/*.h headers as a headers lib: media_plugin_headers
Headers under frameworks/native/include/media serves as an interface
that is meant to be implemented by vendors. For example.
media/hardware/CryptoAPI.h is implemented under
vendor/widevine/libwvdrmengine/mediacrypto.

When building with BOARD_VNDK_VERSION, the headers are not accessible to
vendors since they have been included via the global include paths and
the paths are not available when building with BOARD_VNDK_VERSION.

So, we need to make a "headers library" for the media headers and modify
vendors to use the headers lib. Usually, we have been doing this by
moving the headers into a subdirectory (usually 'include') of a module
that implements the headers. But, this approach can't be used at this
time since the media headers are implemented by many modules.

The chosen solution is to a separate directory headers/media_plugin and
define a headers lib named media_plugin_headers there.

Note: frameworks/native/headers will now be the home for such
header-only libraries.

Bug: 63120269
Test: build
Change-Id: I67d625706b40d06c8f0602284fbcc1cc8b174c6f
2017-07-03 19:35:54 +09:00
Mathias Agopian
6a3c05bcfa fix circular dependency libnativewindow <-> libui
Bug: 37647680
Bug: 37648355
Test: compile, manual
Change-Id: I9631beea52e23ebb519411f943c6f5062aedd2e5
2017-05-09 16:42:31 -07:00
Chong Zhang
45387bbe7a MediaCas: combine openSession methods
bug: 22804304
Change-Id: I380ed6c1fe0f79be9e05d671f9370e5eae18a351
2017-04-11 12:09:35 -07:00
Hangyu Kuang
7c8eed5b99 (DO NOT MERGE) media: Add new OMX extension for setting latency.
Test: Video Recording
Bug: 34221970
Change-Id: I525d86358f3f25a04ae0ac1a80461f8414e5a163
(cherry picked from commit 0c77369428)
2017-04-06 20:06:50 +00:00
Lajos Molnar
1aeef218c9 media: mechanism to set/get vendor-extension configs for OMX component
Add OMX_CONFIG_ANDROID_VENDOR_EXTENSIONTYPE and
OMX_CONFIG_ANDROID_VENDOR_PARAMTYPE.

Android vendor extensions for OMX components have a name and one or
more parameter values - each with a string key - that are set together.
Support for not-set values is provided for vendor extensions in order
to not suddenly confuse applications with format keys that they were
not expecting.

Bug: 32746650
Change-Id: I21aad4a82d509fe2466764f65ee9e3b2d32f0842
2017-03-23 18:09:50 +00:00
Chong Zhang
783c33e19c MediaCas: add plugin APIs
bug: 22804304
Change-Id: I87913f39a95278d0d5eb282f2b83b1fa4d362cec
2017-02-18 00:41:04 +00:00
Stephen Hines
7a779894e1 Merge "Properly align a packed structure." am: 24257dda48 am: 7e500210be am: bfee6aee59
am: e226d82702

Change-Id: I3c9e07e48928390a98c01299fd16d58154f34150
2017-01-24 02:26:43 +00:00
Treehugger Robot
24257dda48 Merge "Properly align a packed structure." 2017-01-24 01:15:07 +00:00
Dan Willemsen
c25a3cf4d2 Merge "Fix unused-parameter warning" am: a2a7195e23 am: d05a784d55 am: 3fb5c68e04
am: 28edf080bf

Change-Id: If2d50fa3c38bb1001806f443473e8f194ed968f8
2016-12-15 07:57:55 +00:00
Stephen Hines
2c9c0125ca Properly align a packed structure.
Bug: http://b/31532493

Taking the address of a packed structure member only guarantees an
alignment of 1, so any use of that address could be misaligned.
Our latest toolchain will generate an error when these packed members
are accessed in an invalid manner. To remedy this, we can mark the
packed structure as having a stricter alignment (so that we can then
further reason about the packed members). We pick uint32_t because that
is the first field for this structure (and the one that is having its
address taken).

Test: Builds successfully with old and updated toolchain.
Change-Id: If98c05097953fbad8437fb04b0e207a85604ae1d
2016-12-14 15:24:18 -08:00
Dan Willemsen
20131921f2 Fix unused-parameter warning
This is exposed when frameworks/av/include is moved from being a system
include directory to a normal include directory.

Test: m -j checkbuild
Change-Id: I127ebe25162f3b6dbb9fc564a6c2c851d0c1636f
2016-12-14 14:43:23 -08:00
Vignesh Venkatasubramanian
79d98e2207 Move VP9 Encoder parameters to the end of the enum
Addressing comment on http://ag/867042

https://googleplex-android-review.git.corp.google.com/#/c/867042/2/include/media/openmax/OMX_IndexExt.h@79

Change-Id: Idec839f62609e659c4de5c9c8de94ecb88a82421
2016-11-29 00:43:13 +00:00
Chong Zhang
69eaed3663 IOMX: adding OMX_IndexParamMaxFrameDurationForBitrateControl
Also adding end tag for index groups where we explictly validate.

bug: 31399200
Change-Id: I164ea60258bae809dd4ff389f2480add926a9c4b
2016-10-19 12:01:25 -07:00
Chih-hung Hsieh
c85c2316ff Merge "Fix google-explicit-constructor warnings in HardwareAPI." am: c8de4a06ab am: 9285335221 am: 64e47fabae
am: 14664fb503

Change-Id: Ifa5345bfaef9b1fc03491b7dc249ecd8ce191247
2016-09-28 23:15:17 +00:00
Chih-hung Hsieh
14664fb503 Merge "Fix google-explicit-constructor warnings in HardwareAPI." am: c8de4a06ab am: 9285335221
am: 64e47fabae

Change-Id: Ia27b9704d92149284e010a85b95e3bb8fbae6e51
2016-09-28 23:10:07 +00:00
Chih-Hung Hsieh
1bf71ef130 Fix google-explicit-constructor warnings in HardwareAPI.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I48521040417aec068795d45aaa2a3870596f9a96
2016-09-01 11:43:58 -07:00
Lajos Molnar
42172ccd97 OMX: document time limits for some operations am: 90093ba019
am: 1d0f9d09b9

Change-Id: I6a6ca39f724d03d491e39384ba331bea9406e603
2016-07-19 23:29:48 +00:00
Lajos Molnar
1d0f9d09b9 OMX: document time limits for some operations
am: 90093ba019

Change-Id: I7a84256d72d1ac9635875df738923e190c439b97
2016-07-19 23:27:14 +00:00
Lajos Molnar
90093ba019 OMX: document time limits for some operations
Bug: 28408062
Bug: 28407319
Change-Id: I7e26eac1d653c871f129b0610e65221b081ba040
2016-07-19 15:36:43 -07:00
Lajos Molnar
21358e2c12 Merge \\"media: add asString for new OMX layering params\\" into nyc-mr1-dev am: e500bfe46f
am: 35e677e807

Change-Id: I71c35f751b98231b89007493d198e23b69a2ceb2
2016-07-14 02:32:40 +00:00
Lajos Molnar
35e677e807 Merge \"media: add asString for new OMX layering params\" into nyc-mr1-dev
am: e500bfe46f

Change-Id: Ifb82e9873ccac0a7781009ddd2efcba6d38d7e49
2016-07-14 02:21:22 +00:00
Lajos Molnar
faff108b53 Merge \\"media: add/fix asString for temporal layering types\\" into nyc-mr1-dev am: b48527f663
am: 89bbd76fb5

Change-Id: I255eefb897d0161ce3cb5c6b4281e1e0f18fce41
2016-07-14 00:15:34 +00:00
Lajos Molnar
89bbd76fb5 Merge \"media: add/fix asString for temporal layering types\" into nyc-mr1-dev
am: b48527f663

Change-Id: I1204f6861caf63fba5abeb586f4b5cb68406368b
2016-07-13 23:56:00 +00:00
Lajos Molnar
e4c00d1ab2 media: add asString for new OMX layering params
Bug: 27596987
Change-Id: I75af5f8a92cf00a43bfa209793db3e79f8621374
2016-07-13 16:32:11 -07:00
Lajos Molnar
b48527f663 Merge "media: add/fix asString for temporal layering types" into nyc-mr1-dev 2016-07-13 23:28:07 +00:00
Lajos Molnar
a0f8de0659 Merge \\"media: clarify i-frame interval for VPx and HEVC codecs\\" into nyc-mr1-dev am: 4578d202ef
am: 47f39ae6e9

Change-Id: I6d9f6b4d2829af8723d28d422b52edd240cf930c
2016-07-13 21:30:49 +00:00
Lajos Molnar
47f39ae6e9 Merge \"media: clarify i-frame interval for VPx and HEVC codecs\" into nyc-mr1-dev
am: 4578d202ef

Change-Id: Ieb1f807aa7c496fcc3816fd757c3a47fbb600759
2016-07-13 19:02:45 +00:00
TreeHugger Robot
4578d202ef Merge "media: clarify i-frame interval for VPx and HEVC codecs" into nyc-mr1-dev 2016-07-13 18:57:21 +00:00
Lajos Molnar
d244112190 media: add/fix asString for temporal layering types
Bug: 27596987
Change-Id: I20c628a2f0ca9770351f7096ce05a2c383e53d41
2016-07-12 18:39:43 -07:00
Praveen Chavan
ab708f6995 media: add OMX extensions for video temporal layering am: 3717b164fa
am: 78d6a91e9e

Change-Id: Ieb72e9cb55028e4eaa217e958b030c16a4b731d8
2016-07-12 22:52:26 +00:00
Praveen Chavan
78d6a91e9e media: add OMX extensions for video temporal layering
am: 3717b164fa

Change-Id: I6cf6bd65d9c21f4f92c551b83c52a3449b55e5ad
2016-07-12 22:49:00 +00:00
Praveen Chavan
3717b164fa media: add OMX extensions for video temporal layering
Add static/dynamic configuration structures to setup/tune
video encoder for temporal layering

Bug: 27596987
Change-Id: Ic260872aa49faee6d17a84e6177ef94c35ef0d68
2016-07-12 14:06:47 -07:00
Lajos Molnar
0ff672d450 media: clarify i-frame interval for VPx and HEVC codecs
Bug: 30096321
Change-Id: I421487e6ba3d4054f9a179dc5109a01564b945f4
2016-07-12 14:04:57 -07:00
Jean-Michel Trivi
a1adfb7a6d Define OMX_AUDIO_AACObjectER_Scalable
Add enumeration entry and string for ER-AAC-Scalable

Bug 29221608

Change-Id: Ia9309f303ccab19cd863e3a8614468ece7e92b4a
2016-06-08 15:21:37 -07:00
Chih-hung Hsieh
f27b1f1847 Merge "Fix misc-macro-parentheses warnings in openmax." am: cb68066d06 am: 408c240973 am: a623d13673
am: 09888e6482

* commit '09888e6482c8f2a3b40fa3bf9814a4dadb39f6af':
  Fix misc-macro-parentheses warnings in openmax.

Change-Id: I57cfdeb958fdbbcdd8b383fb647437274d73c653
2016-05-27 20:45:40 +00:00
Chih-hung Hsieh
a623d13673 Merge "Fix misc-macro-parentheses warnings in openmax." am: cb68066d06
am: 408c240973

* commit '408c24097392d52c38bd0e26e3d9a3c76e4cc0a4':
  Fix misc-macro-parentheses warnings in openmax.

Change-Id: I987a1c8cbd2b28becc7df69912cd0d88ed17c52d
2016-05-27 17:58:01 +00:00
Lajos Molnar
e1efbed167 stagefright: define mpeg2 HighP level constant am: 9e332babb9 am: e736deaad3
am: 9730aee854

* commit '9730aee854a9cb3b67bdb423c8a7082dda1cfe06':
  stagefright: define mpeg2 HighP level constant

Change-Id: I676558b9895065ec774abb70757f6eda2f88d68a
2016-05-24 14:42:52 +00:00
Lajos Molnar
9e332babb9 stagefright: define mpeg2 HighP level constant
Bug: 28671284
Change-Id: Ic97fd9c3cb4ce04f9cfcd18a4daf68db3349694b
2016-05-24 07:03:42 -07:00
Lajos Molnar
b081cf50ba omx: add asString for new enumerations and fix some issues am: 1b9c8069f4 am: 730cd51231
am: c84d0b1d5b

* commit 'c84d0b1d5b8bf265b3de3278e56be0ce9d62e9ae':
  omx: add asString for new enumerations and fix some issues

Change-Id: Ie7da01b8bad7ff6aa42b3873a67c97b8beaac804
2016-05-23 16:33:23 +00:00
Lajos Molnar
1b9c8069f4 omx: add asString for new enumerations and fix some issues
Bug: 28671284
Change-Id: I54e98d727f974544d51b2a14b565ad24912ab242
2016-05-23 15:01:15 +00:00
Lajos Molnar
1207969f4f Merge "omx: add missing MPEG4 levels" into nyc-dev am: 6472c8c660 am: 8bd815b96d
am: df16d3775b

* commit 'df16d3775b7139a10ca7e5bc2e1d721cc03887ec':
  omx: add missing MPEG4 levels

Change-Id: I943b7508a7af9222bc5326d77ba27f2c4e58bb43
2016-05-23 13:27:40 +00:00
Chih-Hung Hsieh
1597660e95 Fix misc-macro-parentheses warnings in openmax.
Bug: 28705665
Change-Id: Ifda977c1754b4bc87b0fe24bf3dab6890bdf344a
2016-05-20 11:45:03 -07:00
Lajos Molnar
059e2985bc omx: add missing MPEG4 levels
Bug: 28671284
Change-Id: I96b50580cc29c11732fd2b496ba6d832b7067256
2016-05-19 15:28:54 -07:00
Hangyu Kuang
9a07fc48e4 Merge "media: Add missing dobly-vision profile." into nyc-dev am: 99c68bbfa3 am: 07c41bfc80
am: 6e6e8767c1

* commit '6e6e8767c1b23ac6b3e36baa47e6b92e49c18af3':
  media: Add missing dobly-vision profile.

Change-Id: I030b39368b87095ff195eb691608781f1b534d21
2016-04-29 01:10:33 +00:00
Hangyu Kuang
99c68bbfa3 Merge "media: Add missing dobly-vision profile." into nyc-dev 2016-04-29 00:58:18 +00:00
Hangyu Kuang
6c02314b72 media: Add missing dobly-vision profile.
Bug:28411120
Change-Id: Icd72dd1ede99e64b77f6b27f61d37a75130669cf
2016-04-28 10:54:04 -07:00
Hangyu Kuang
d15a35bcdd media: Change VP9 ProfileLevel to start from 0x1.
Bug:28380207
Related to Bug: 25684127

Change-Id: I396a65991acc066ae05bc8b65a2e7ea787599f64
2016-04-26 18:08:58 -07:00
Hangyu Kuang
7788a3a38b media: update VP9 CodecProfileLevel
Bug:27969307
Change-Id: I214e0aeb70e1f5a1520eea9ff206c13abd1a3a2a
2016-04-11 21:36:42 +00:00
Hangyu Kuang
19c6a8340c media: update VP9 CodecProfileLevel
Bug:27969307
Change-Id: I214e0aeb70e1f5a1520eea9ff206c13abd1a3a2a
2016-04-09 01:20:47 +00:00
Ronghua Wu
2f5a0fd169 media: update Dolby Vision Profile. am: 9917903
am: c947731

* commit 'c947731ba5c05082796ea36c07b875c95d1e8d5b':
  media: update Dolby Vision Profile.

Change-Id: I692f1a26693d4e6e70833ef873611c9682ed1b24
2016-04-01 18:36:48 +00:00